Commit55eac74

committed

Rewrite check for fiel sizse overflow

1 parente18cea1 commit55eac74Copy full SHA for 55eac74

File tree

+12

-16

lines changed

+12

-16

lines changed

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -470,14 +470,16 @@ int cfs_munmap(FileMap* map)`
`470`	`470`	`*/`
`471`	`471`	`uint32cfs_alloc_page(FileMap*map,uint32oldSize,uint32newSize)`
`472`	`472`	`{`
`473`		`-pg_atomic_fetch_add_u32(&map->hdr.usedSize,newSize-oldSize);`
`474`		`-returnpg_atomic_fetch_add_u32(&map->hdr.physSize,newSize);`
`475`		`-}`
	`473`	`+uint32oldPhysSize=pg_atomic_read_u32(&map->hdr.physSize);`
	`474`	`+uint32newPhysSize;`
`476`	`475`
`477`		`-voidcfs_undo_alloc_page(FileMap*map,uint32oldSize,uint32newSize)`
`478`		`-{`
`479`		`-pg_atomic_fetch_sub_u32(&map->hdr.usedSize,newSize-oldSize);`
`480`		`-pg_atomic_fetch_sub_u32(&map->hdr.physSize,newSize);`
	`476`	`+do {`
	`477`	`+newPhysSize=oldPhysSize+newSize;`
	`478`	`+if (oldPhysSize>newPhysSize)`
	`479`	`+elog(ERROR,"CFS: segment file exceed 4Gb limit");`
	`480`	`+}while (!pg_atomic_compare_exchange_u32(&map->hdr.physSize,&oldPhysSize,newPhysSize));`
	`481`	`+`
	`482`	`+returnoldPhysSize;`
`481`	`483`	`}`
`482`	`484`
`483`	`485`	`/*`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1980,10 +1980,6 @@ FileWrite(File file, char *buffer, int amount)`
`1980`	`1980`	`* because we want to write all updated pages sequentially`
`1981`	`1981`	`*/`
`1982`	`1982`	`pos=cfs_alloc_page(map,CFS_INODE_SIZE(inode),compressedSize);`
`1983`		`-if (pos>CFS_RED_LINE) {`
`1984`		`-cfs_undo_alloc_page(map,CFS_INODE_SIZE(inode),compressedSize);`
`1985`		`-elog(ERROR,"CFS: segment file exceed 4Gb limit");`
`1986`		`-}`
`1987`	`1983`
`1988`	`1984`	`inode=CFS_INODE(compressedSize,pos);`
`1989`	`1985`	`buffer=compressedBuffer;`
`@@ -2110,7 +2106,7 @@ FileWrite(File file, char *buffer, int amount)`
`2110`	`2106`	`{`
`2111`	`2107`	`elog(LOG,"CFS: backend %d forced to perform GC on file %s block %u because it's size exceed %u bytes",`
`2112`	`2108`	`MyProcPid,VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos /BLCKSZ),pos);`
`2113`		`-cfs_gc_segment(VfdCache[file].fileName,pos+amount<CFS_YELLOW_LINE);`
	`2109`	`+cfs_gc_segment(VfdCache[file].fileName,pos+amount<CFS_RED_LINE);`
`2114`	`2110`	`}`
`2115`	`2111`	`}`
`2116`	`2112`	`returnreturnCode;`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include"port/atomics.h"`
`7`	`7`	`#include"storage/rijndael.h"`
`8`	`8`
`9`		`-#defineCFS_VERSION "0.43"`
	`9`	`+#defineCFS_VERSION "0.45"`
`10`	`10`
`11`	`11`	`#defineCFS_GC_LOCK 0x10000000`
`12`	`12`
`@@ -52,8 +52,7 @@ typedef uint64 inode_t;`
`52`	`52`	`#defineCFS_INODE(size,offs) (((inode_t)(size) << 32) \| (offs))`
`53`	`53`
`54`	`54`	`#defineCFS_IMPLICIT_GC_THRESHOLD 0x80000000U/* 2Gb */`
`55`		`-#defineCFS_YELLOW_LINE 0xC0000000U/* 3Gb */`
`56`		`-#defineCFS_RED_LINE 0xFFF00000U/* 4Gb - page_size100 /`
	`55`	`+#defineCFS_RED_LINE 0xC0000000U/* 3Gb */`
`57`	`56`
`58`	`57`	`size_tcfs_compress(voiddst,size_tdst_size,voidconstsrc,size_tsrc_size);`
`59`	`58`	`size_tcfs_decompress(voiddst,size_tdst_size,voidconstsrc,size_tsrc_size);`
`@@ -125,7 +124,6 @@ typedef struct`
`125`	`124`	`voidcfs_lock_file(FileMapmap,charconstpath);`
`126`	`125`	`voidcfs_unlock_file(FileMap*map);`
`127`	`126`	`uint32cfs_alloc_page(FileMap*map,uint32oldSize,uint32newSize);`
`128`		`-voidcfs_undo_alloc_page(FileMap*map,uint32oldSize,uint32newSize);`
`129`	`127`	`voidcfs_extend(FileMap*map,uint32pos);`
`130`	`128`	`boolcfs_control_gc(boolenabled);`
`131`	`129`	`intcfs_msync(FileMap*map);`

Comments

(0)