shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

cov: ensure data is not derefenced

Browse Source 
Ensure all hypothetical paths cannot dereference NULL *(u->data).
This commit is contained in:
Zdenek Kabelac 2021-09-20 01:46:43 +02:00
parent 3e7e9cc5e6
commit bfc6fe2bac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/device/bcache-utils.c
View File

@ -164,8 +164,10 @@ static bool _write_partial(struct updater *u, int di, block_address bb,
if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b)) if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b))
return false; return false;
if (u->data) {
memcpy(((unsigned char *) b->data) + offset, u->data, len); memcpy(((unsigned char *) b->data) + offset, u->data, len);
u->data = ((unsigned char *) u->data) + len; u->data = ((unsigned char *) u->data) + len;
}
bcache_put(b); bcache_put(b);
return true; return true;
@ -246,7 +248,7 @@ bool bcache_zero_bytes(struct bcache *cache, int di, uint64_t start, size_t len)
static bool _set_partial(struct updater *u, int di, block_address bb, uint64_t offset, size_t len) static bool _set_partial(struct updater *u, int di, block_address bb, uint64_t offset, size_t len)
{ {
struct block *b; struct block *b;
uint8_t val = *((uint8_t *) u->data); uint8_t val = (u->data) ? *((uint8_t *) u->data) : 0;
if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b)) if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b))
return false; return false;
@ -260,7 +262,7 @@ static bool _set_partial(struct updater *u, int di, block_address bb, uint64_t o
static bool _set_whole(struct updater *u, int di, block_address bb, block_address be) static bool _set_whole(struct updater *u, int di, block_address bb, block_address be)
{ {
struct block *b; struct block *b;
uint8_t val = *((uint8_t *) u->data); uint8_t val = (u->data) ? *((uint8_t *) u->data) : 0;
uint64_t len = bcache_block_sectors(u->cache) * 512; uint64_t len = bcache_block_sectors(u->cache) * 512;
for (; bb != be; bb++) { for (; bb != be; bb++) {