Skip to content

Commit

Permalink
Coverity fixes resources leaks
Browse files Browse the repository at this point in the history
Handle variable going out of scope leaks the handle.

Signed-off-by: Nigel Croxon <[email protected]>
  • Loading branch information
ncroxon authored and mtkaczyk committed Dec 16, 2024
1 parent 8e56efa commit 8f54ce5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Assemble.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,7 @@ static int load_devices(struct devs *devices, char *devmap,
tst->ss->free_super(tst);
free(tst);
*stp = st;
free(best);
return -1;
}
close(dfd);
Expand Down Expand Up @@ -834,7 +835,6 @@ static int load_devices(struct devs *devices, char *devmap,
inargv ? "the list" :
"the\n DEVICE list in mdadm.conf"
);
free(best);
*stp = st;
goto error;
}
Expand All @@ -857,6 +857,7 @@ static int load_devices(struct devs *devices, char *devmap,
close(mdfd);
free(devices);
free(devmap);
free(best);
return -1;

}
Expand Down
2 changes: 1 addition & 1 deletion Incremental.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
* clustering resource agents
*/
if (info.array.state & (1 << MD_SB_CLUSTERED))
goto out;
goto out_unlock;

/* Couldn't find an existing array, maybe make a new one */
mdfd = create_mddev(match ? match->devname : NULL, name_to_use, trustworthy,
Expand Down
7 changes: 5 additions & 2 deletions bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,11 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
return rv;

info = bitmap_fd_read(fd, brief);
if (!info)
if (!info) {
close_fd(&fd);
free(info);
return rv;
}
sb = &info->sb;
if (sb->magic != BITMAP_MAGIC) {
pr_err("This is an md array. To view a bitmap you need to examine\n");
Expand Down Expand Up @@ -336,7 +339,6 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
printf(" Cluster name : %-64s\n", sb->cluster_name);
for (i = 0; i < (int)sb->nodes; i++) {
st = NULL;
free(info);
fd = bitmap_file_open(filename, &st, i, fd);
if (fd < 0) {
printf(" Unable to open bitmap file on node: %i\n", i);
Expand All @@ -347,6 +349,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
printf(" Unable to read bitmap on node: %i\n", i);
continue;
}
free(sb);
sb = &info->sb;
if (sb->magic != BITMAP_MAGIC)
pr_err("invalid bitmap magic 0x%x, the bitmap file appears to be corrupted\n", sb->magic);
Expand Down

0 comments on commit 8f54ce5

Please sign in to comment.