From: "Lukáš Czerner" <lczerner@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: tytso@mit.edu, linux-ext4@vger.kernel.org
Subject: Re: [PATCH 02/37] misc: coverity fixes
Date: Fri, 2 May 2014 13:17:49 +0200 (CEST) [thread overview]
Message-ID: <alpine.LFD.2.00.1405021306530.2154@localhost.localdomain> (raw)
In-Reply-To: <20140501231236.31890.46904.stgit@birch.djwong.org>
On Thu, 1 May 2014, Darrick J. Wong wrote:
> Date: Thu, 01 May 2014 16:12:36 -0700
> From: Darrick J. Wong <darrick.wong@oracle.com>
> To: tytso@mit.edu, darrick.wong@oracle.com
> Cc: linux-ext4@vger.kernel.org
> Subject: [PATCH 02/37] misc: coverity fixes
>
> Fix various small resource leaks and error code handling issues that
> Coverity pointed out.
>
> Fixes-Coverity-Bugs: 11919{39-45}, 1174118, 1049160, 1049144
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> debugfs/xattrs.c | 38 ++++++++++++++++++++------------------
> lib/ext2fs/extent.c | 7 ++++---
> lib/ext2fs/punch.c | 2 +-
> misc/create_inode.c | 34 ++++++++++++++++++++--------------
> 4 files changed, 45 insertions(+), 36 deletions(-)
>
>
> diff --git a/debugfs/xattrs.c b/debugfs/xattrs.c
> index 0a29521..7109719 100644
> --- a/debugfs/xattrs.c
> +++ b/debugfs/xattrs.c
> @@ -122,26 +122,26 @@ void do_get_xattr(int argc, char **argv)
> default:
> printf("%s: Usage: %s <file> <attr> [-f outfile]\n",
> argv[0], argv[0]);
> - return;
> + goto out2;
> }
> }
>
> if (optind != argc - 2) {
> printf("%s: Usage: %s <file> <attr> [-f outfile]\n", argv[0],
> argv[0]);
> - return;
> + goto out2;
> }
>
> if (check_fs_open(argv[0]))
> - return;
> + goto out2;
>
> ino = string_to_inode(argv[optind]);
> if (!ino)
> - return;
> + goto out2;
>
> err = ext2fs_xattrs_open(current_fs, ino, &h);
> if (err)
> - return;
> + goto out2;
>
> err = ext2fs_xattrs_read(h);
> if (err)
> @@ -153,18 +153,19 @@ void do_get_xattr(int argc, char **argv)
>
> if (fp) {
> fwrite(buf, buflen, 1, fp);
> - fclose(fp);
> } else {
> dump_xattr_string(stdout, buf, buflen);
> printf("\n");
> }
>
> - if (buf)
> - ext2fs_free_mem(&buf);
> + ext2fs_free_mem(&buf);
> out:
> ext2fs_xattrs_close(&h);
> if (err)
> com_err(argv[0], err, "while getting extended attribute");
> +out2:
> + if (fp)
> + fclose(fp);
> }
>
> void do_set_xattr(int argc, char **argv)
> @@ -190,30 +191,30 @@ void do_set_xattr(int argc, char **argv)
> default:
> printf("%s: Usage: %s <file> <attr> [-f infile | "
> "value]\n", argv[0], argv[0]);
> - return;
> + goto out2;
> }
> }
>
> if (optind != argc - 2 && optind != argc - 3) {
> printf("%s: Usage: %s <file> <attr> [-f infile | value>]\n",
> argv[0], argv[0]);
> - return;
> + goto out2;
> }
>
> if (check_fs_open(argv[0]))
> - return;
> + goto out2;
> if (check_fs_read_write(argv[0]))
> - return;
> + goto out2;
> if (check_fs_bitmaps(argv[0]))
> - return;
> + goto out2;
>
> ino = string_to_inode(argv[optind]);
> if (!ino)
> - return;
> + goto out2;
>
> err = ext2fs_xattrs_open(current_fs, ino, &h);
> if (err)
> - return;
> + goto out2;
>
> err = ext2fs_xattrs_read(h);
> if (err)
> @@ -238,13 +239,14 @@ void do_set_xattr(int argc, char **argv)
> goto out;
>
> out:
> + ext2fs_xattrs_close(&h);
> + if (err)
> + com_err(argv[0], err, "while setting extended attribute");
> +out2:
> if (fp) {
> fclose(fp);
> ext2fs_free_mem(&buf);
> }
> - ext2fs_xattrs_close(&h);
> - if (err)
> - com_err(argv[0], err, "while setting extended attribute");
> }
>
> void do_rm_xattr(int argc, char **argv)
> diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
> index 80ce88f..30673b5 100644
> --- a/lib/ext2fs/extent.c
> +++ b/lib/ext2fs/extent.c
> @@ -1482,7 +1482,7 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
> if (retval) {
> r2 = ext2fs_extent_goto(handle, orig_lblk);
> if (r2 == 0)
> - ext2fs_extent_replace(handle, 0,
> + (void)ext2fs_extent_replace(handle, 0,
> &orig_extent);
> goto done;
> }
> @@ -1498,11 +1498,12 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
> r2 = ext2fs_extent_goto(handle,
> newextent.e_lblk);
> if (r2 == 0)
> - ext2fs_extent_delete(handle, 0);
> + (void)ext2fs_extent_delete(handle, 0);
> }
> r2 = ext2fs_extent_goto(handle, orig_lblk);
> if (r2 == 0)
> - ext2fs_extent_replace(handle, 0, &orig_extent);
> + (void)ext2fs_extent_replace(handle, 0,
> + &orig_extent);
> goto done;
> }
> }
> diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c
> index 60cd2a3..c9250cd 100644
> --- a/lib/ext2fs/punch.c
> +++ b/lib/ext2fs/punch.c
> @@ -403,7 +403,7 @@ static errcode_t ext2fs_punch_extent(ext2_filsys fs, ext2_ino_t ino,
> retval = 0;
>
> /* Jump forward to the next extent. */
> - ext2fs_extent_goto(handle, next_lblk);
> + (void)ext2fs_extent_goto(handle, next_lblk);
Why do we not want to check the return value of this ? There might
be an error right ?
> op = EXT2_EXTENT_CURRENT;
> }
> if (retval)
> diff --git a/misc/create_inode.c b/misc/create_inode.c
> index 964c66a..4bb5e5b 100644
> --- a/misc/create_inode.c
> +++ b/misc/create_inode.c
> @@ -465,7 +465,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> char ln_target[PATH_MAX];
> unsigned int save_inode;
> ext2_ino_t ino;
> - errcode_t retval;
> + errcode_t retval = 0;
> int read_cnt;
> int hdlink;
>
> @@ -486,7 +486,11 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> if ((!strcmp(dent->d_name, ".")) ||
> (!strcmp(dent->d_name, "..")))
> continue;
> - lstat(dent->d_name, &st);
> + if (lstat(dent->d_name, &st)) {
> + com_err(__func__, errno, _("while lstat \"%s\""),
> + dent->d_name);
> + goto out;
> + }
> name = dent->d_name;
>
> /* Check for hardlinks */
> @@ -501,7 +505,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> if (retval) {
> com_err(__func__, retval,
> "while linking %s", name);
> - return retval;
> + goto out;
> }
> continue;
> } else
> @@ -517,7 +521,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> com_err(__func__, retval,
> _("while creating special file "
> "\"%s\""), name);
> - return retval;
> + goto out;
> }
> break;
> case S_IFSOCK:
> @@ -527,7 +531,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> continue;
> case S_IFLNK:
> read_cnt = readlink(name, ln_target,
> - sizeof(ln_target));
> + sizeof(ln_target) - 1);
> if (read_cnt == -1) {
> com_err(__func__, errno,
> _("while trying to readlink \"%s\""),
> @@ -541,7 +545,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> com_err(__func__, retval,
> _("while writing symlink\"%s\""),
> name);
> - return retval;
> + goto out;
> }
> break;
> case S_IFREG:
> @@ -550,7 +554,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> if (retval) {
> com_err(__func__, retval,
> _("while writing file \"%s\""), name);
> - return retval;
> + goto out;
> }
> break;
> case S_IFDIR:
> @@ -559,25 +563,25 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> if (retval) {
> com_err(__func__, retval,
> _("while making dir \"%s\""), name);
> - return retval;
> + goto out;
> }
> retval = ext2fs_namei(fs, root, parent_ino,
> name, &ino);
> if (retval) {
> com_err(name, retval, 0);
> - return retval;
> + goto out;
> }
> /* Populate the dir recursively*/
> retval = __populate_fs(fs, ino, name, root, hdlinks);
> if (retval) {
> com_err(__func__, retval,
> _("while adding dir \"%s\""), name);
> - return retval;
> + goto out;
> }
> if (chdir("..")) {
> com_err(__func__, errno,
> _("during cd .."));
> - return errno;
you probably wan to store errno in retval because that's what we
return from the function.
> + goto out;
> }
> break;
> default:
> @@ -588,14 +592,14 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> retval = ext2fs_namei(fs, root, parent_ino, name, &ino);
> if (retval) {
> com_err(name, retval, 0);
> - return retval;
> + goto out;
> }
>
> retval = set_inode_extra(fs, parent_ino, ino, &st);
> if (retval) {
> com_err(__func__, retval,
> _("while setting inode for \"%s\""), name);
> - return retval;
> + goto out;
> }
>
> /* Save the hardlink ino */
> @@ -612,7 +616,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> if (p == NULL) {
> com_err(name, errno,
> _("Not enough memory"));
> - return errno;
> + goto out;
same here.
Thanks!
-Lukas
> }
> hdlinks->hdl = p;
> hdlinks->size += HDLINK_CNT;
> @@ -623,6 +627,8 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
> hdlinks->count++;
> }
> }
> +
> +out:
> closedir(dh);
> return retval;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2014-05-02 11:17 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-01 23:12 [PATCH 00/37] e2fsprogs patchbomb 5/14 Darrick J. Wong
2014-05-01 23:12 ` [PATCH 01/37] misc: create better-packaged static analysis reports Darrick J. Wong
2014-05-11 22:33 ` Theodore Ts'o
2014-05-01 23:12 ` [PATCH 02/37] misc: coverity fixes Darrick J. Wong
2014-05-02 11:17 ` Lukáš Czerner [this message]
2014-05-05 20:04 ` Darrick J. Wong
2014-05-11 22:40 ` Theodore Ts'o
2014-05-01 23:12 ` [PATCH 03/37] libext2fs: create sockets when populating filesystem Darrick J. Wong
2014-05-02 11:22 ` Lukáš Czerner
2014-05-05 20:08 ` Darrick J. Wong
2014-05-11 22:44 ` Theodore Ts'o
2014-05-01 23:12 ` [PATCH 04/37] mke2fs: always warn if 128-byte inode and inline_data Darrick J. Wong
2014-05-02 11:27 ` Lukáš Czerner
2014-05-05 20:10 ` Darrick J. Wong
2014-05-12 0:26 ` Theodore Ts'o
2014-05-01 23:12 ` [PATCH 05/37] debugfs: teach logdump to deal with 64bit revoke tables Darrick J. Wong
2014-05-02 11:38 ` Lukáš Czerner
2014-05-05 22:23 ` Darrick J. Wong
2014-05-06 11:35 ` Lukáš Czerner
2014-05-12 1:20 ` Theodore Ts'o
2014-05-01 23:13 ` [PATCH 06/37] debugfs: force logdump to display (old) journal contents Darrick J. Wong
2014-05-02 11:49 ` Lukáš Czerner
2014-05-06 0:24 ` Darrick J. Wong
2014-05-12 1:41 ` Theodore Ts'o
2014-05-12 3:31 ` Theodore Ts'o
2014-05-14 0:05 ` Darrick J. Wong
2014-05-01 23:13 ` [PATCH 07/37] resize2fs: fix check for collision between old GDT and superblock on sparse_super2 fs Darrick J. Wong
2014-05-12 3:35 ` Theodore Ts'o
2014-05-01 23:13 ` [PATCH 08/37] mke2fs: set gdt csum when creating packed fs Darrick J. Wong
2014-05-02 11:55 ` Lukáš Czerner
2014-05-12 4:22 ` Theodore Ts'o
2014-05-01 23:13 ` [PATCH 09/37] mke2fs: set error behavior at initialization time Darrick J. Wong
2014-05-02 12:13 ` Lukáš Czerner
2014-05-01 23:13 ` [PATCH 10/37] e2fsck: verify checksums after checking everything else Darrick J. Wong
2014-05-02 12:32 ` Lukáš Czerner
2014-05-05 22:56 ` Darrick J. Wong
2014-05-06 11:32 ` Lukáš Czerner
2014-05-08 0:05 ` Darrick J. Wong
2014-05-01 23:13 ` [PATCH 11/37] e2fsck: fix the extended attribute checksum error message Darrick J. Wong
2014-05-02 12:46 ` Lukáš Czerner
2014-05-05 23:08 ` Darrick J. Wong
2014-05-06 10:12 ` Lukáš Czerner
2014-05-01 23:13 ` [PATCH 12/37] e2fsck: insert a missing dirent tail for checksums if possible Darrick J. Wong
2014-05-02 12:54 ` Lukáš Czerner
2014-05-05 23:16 ` Darrick J. Wong
2014-05-01 23:13 ` [PATCH 13/37] e2fsck: write dir blocks after new inode when reconstructing root/lost+found Darrick J. Wong
2014-05-05 17:13 ` Lukáš Czerner
2014-05-01 23:13 ` [PATCH 14/37] dumpe2fs: add switch to disable checksum verification Darrick J. Wong
2014-05-05 17:20 ` Lukáš Czerner
2014-05-01 23:14 ` [PATCH 15/37] mke2fs: set block_validity as a default mount option Darrick J. Wong
2014-05-05 17:24 ` Lukáš Czerner
2014-05-01 23:14 ` [PATCH 16/37] libext2fs: support allocating uninit blocks in bmap2() Darrick J. Wong
2014-05-06 15:45 ` Lukáš Czerner
2014-05-06 19:59 ` Darrick J. Wong
2014-05-07 10:02 ` Lukáš Czerner
2014-05-07 21:37 ` Darrick J. Wong
2014-05-08 0:13 ` [PATCH 1/2] libext2fs: support BLKZEROOUT/FALLOC_FL_ZERO_RANGE in ext2fs_zero_blocks Darrick J. Wong
2014-05-13 11:11 ` Lukáš Czerner
2014-05-08 0:14 ` [PATCH 2/2] libext2fs: support allocating uninit blocks in bmap2() Darrick J. Wong
2014-05-27 16:28 ` Lukáš Czerner
2014-05-28 19:48 ` Darrick J. Wong
2014-05-01 23:14 ` [PATCH 17/37] libext2fs: file IO routines should handle uninit blocks Darrick J. Wong
2014-05-01 23:14 ` [PATCH 18/37] resize2fs: convert fs to and from 64bit mode Darrick J. Wong
2014-05-01 23:14 ` [PATCH 19/37] resize2fs: when toggling 64bit, don't free in-use bg data clusters Darrick J. Wong
2014-05-01 23:14 ` [PATCH 20/37] resize2fs: adjust reserved_gdt_blocks when changing group descriptor size Darrick J. Wong
2014-05-01 23:14 ` [PATCH 21/37] libext2fs: have UNIX IO manager use pread/pwrite Darrick J. Wong
2014-08-02 23:16 ` Theodore Ts'o
2014-05-01 23:14 ` [PATCH 22/37] ext2fs: add readahead method to improve scanning Darrick J. Wong
2014-05-01 23:14 ` [PATCH 23/37] e2fsck: provide routines to read-ahead metadata Darrick J. Wong
2014-05-01 23:14 ` [PATCH 24/37] e2fsck: read-ahead metadata during passes 1, 2, and 4 Darrick J. Wong
2014-07-28 22:25 ` Darrick J. Wong
2014-05-01 23:15 ` [PATCH 25/37] libext2fs: when appending to a file, don't split an index block in equal halves Darrick J. Wong
2014-08-02 23:43 ` Theodore Ts'o
2014-05-01 23:15 ` [PATCH 26/37] libext2fs: find inode goal when allocating blocks Darrick J. Wong
2014-05-01 23:15 ` [PATCH 27/37] libext2fs: find a range of empty blocks Darrick J. Wong
2014-05-01 23:15 ` [PATCH 28/37] libext2fs: provide a function to set inode size Darrick J. Wong
2014-07-26 18:37 ` Theodore Ts'o
2014-05-01 23:15 ` [PATCH 29/37] libext2fs: implement fallocate Darrick J. Wong
2014-05-01 23:15 ` [PATCH 31/37] fuse2fs: translate ACL structures Darrick J. Wong
2014-05-01 23:15 ` [PATCH 32/37] fuse2fs: handle 64-bit dates correctly Darrick J. Wong
2014-05-01 23:16 ` [PATCH 33/37] fuse2fs: implement fallocate Darrick J. Wong
2014-05-01 23:16 ` [PATCH 35/37] tests: enable using fuse2fs with metadata checksum test Darrick J. Wong
2014-05-01 23:16 ` [PATCH 36/37] tests: test date handling Darrick J. Wong
2014-05-01 23:16 ` [PATCH 37/37] ext5: define new subtype to add features and reduce testing complexity Darrick J. Wong
2014-05-02 9:45 ` Lukáš Czerner
2014-05-02 14:04 ` Theodore Ts'o
2014-05-06 1:59 ` Darrick J. Wong
2014-05-06 1:33 ` Darrick J. Wong
2014-05-06 12:50 ` Lukáš Czerner
2014-05-06 15:21 ` Theodore Ts'o
2014-05-06 15:30 ` Lukáš Czerner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.00.1405021306530.2154@localhost.localdomain \
--to=lczerner@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox