| 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
| ||
|
Date: Tue, 18 Dec 2012 22:26:38 +0100 From: Cong Ding <dinggnu@...il.com> To: Andrew Morton <akpm@...ux-foundation.org>, Kees Cook <keescook@...omium.org>, Jiri Kosina <jkosina@...e.cz>, Jesper Juhl <jj@...esealer.com>, linux-kernel@...r.kernel.org Cc: Cong Ding <dinggnu@...il.com> Subject: [PATCH] usr/gen_init_cpio.c: remove unnecessary "if" usr/gen_init_cpio.c: remove unnecessary "if" if it goes to fail, dname isn't allocated; otherwise, it is allocated successfully. so we just free memory when it doesn't fail. this patch also fix a trival trailing space warning by checkpatch Signed-off-by: Cong Ding <dinggnu@...il.com> --- usr/gen_init_cpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index af8c925..afebe09 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -372,7 +372,7 @@ static int cpio_mkfile(const char *name, const char *location, } ino++; rc = 0; - + error: if (filebuf) free(filebuf); if (file >= 0) close(file); @@ -452,8 +452,8 @@ static int cpio_mkfile_line(const char *line) } rc = cpio_mkfile(dname, cpio_replace_env(location), mode, uid, gid, nlinks); + free(dname); fail: - if (dname_len) free(dname); return rc; } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists