lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20131018044948.7339.56696.stgit@birch.djwong.org> Date: Thu, 17 Oct 2013 21:49:48 -0700 From: "Darrick J. Wong" <darrick.wong@...cle.com> To: tytso@....edu, darrick.wong@...cle.com Cc: Darren Hart <dvhart@...ux.intel.com>, linux-ext4@...r.kernel.org, Robert Yang <liezhi.yang@...driver.com> Subject: [PATCH 08/25] debugfs: fix various minor bogosity We should really use the ext2fs memory allocator functions in copy_file(), and we really should return a value if there's allocation problems. Also fix up a minor bogosity in an error message. Cc: Robert Yang <liezhi.yang@...driver.com> Cc: Darren Hart <dvhart@...ux.intel.com> Signed-off-by: Darrick J. Wong <darrick.wong@...cle.com> --- debugfs/debugfs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 4f6108d..d3db356 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -1601,9 +1601,10 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_hol if (retval) return retval; - if (!(buf = (char *) malloc(bufsize))){ - com_err("copy_file", errno, "can't allocate buffer\n"); - return; + retval = ext2fs_get_mem(bufsize, &buf); + if (retval) { + com_err("copy_file", retval, "can't allocate buffer\n"); + return retval; } /* This is used for checking whether the whole block is zero */ @@ -1654,7 +1655,7 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_hol return retval; fail: - free(buf); + ext2fs_free_mem(&buf); ext2fs_free_mem(&zero_buf); (void) ext2fs_file_close(e2_file); return retval; @@ -2112,7 +2113,7 @@ void do_bmap(int argc, char *argv[]) errcode = ext2fs_bmap2(current_fs, ino, 0, 0, 0, blk, 0, &pblk); if (errcode) { - com_err("argv[0]", errcode, + com_err(argv[0], errcode, "while mapping logical block %llu\n", blk); return; } -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists