2007-02-10 02:14:31

by Brian Behlendorf

[permalink] [raw]
Subject: e2fsprogs coverity patch <cid-24.diff>

Lawrence Livermore National Labs recently ran the source code
analysis tool Coverity over the e2fsprogs-1.39 source to see
if it would identify any significant bugs. The analysis
turned up 38 mostly minor issues which are enumerated here
with patches. We went through and resolved these issues
but would love to see these mostly minor changes reviewed
and commited upstream.

Brian Behlendorf <[email protected]>, and
Herb Wartens <[email protected]>

Coverity ID: 24: Resource Leak

Handle leaked cbuf due to early returns with a generic failure path.

Index: e2fsprogs+chaos/debugfs/htree.c
--- e2fsprogs+chaos.orig/debugfs/htree.c
+++ e2fsprogs+chaos/debugfs/htree.c
@@ -149,27 +149,29 @@ static void htree_dump_int_block(ext2_fi
cbuf = malloc(fs->blocksize);
if (!cbuf) {
fprintf(pager, "Couldn't allocate child block.\n");
- return;
+ goto errout;

errcode = ext2fs_bmap(fs, ino, inode, buf, 0, blk, &pblk);
if (errcode) {
com_err("htree_dump_int_block", errcode,
"while mapping logical block %u\n", blk);
- return;
+ goto errout;

errcode = io_channel_read_blk(current_fs->io, pblk, 1, buf);
if (errcode) {
com_err("htree_dump_int_block", errcode,
"while reading block %u\n", blk);
- return;
+ goto errout;

htree_dump_int_node(fs, ino, inode, rootnode,
(struct ext2_dx_entry *) (buf+8),
cbuf, level);
- free(cbuf);
+ if (cbuf)
+ free(cbuf);