Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c4971e authored by WANG Cong's avatar WANG Cong Committed by Al Viro
Browse files

[Patch] fs/binfmt_elf.c: fix wrong return values 



create_elf_tables() returns 0 on success. But when strnlen_user() "fails",
it returns 0 directly. So this is wrong.

Signed-off-by: default avatarWANG Cong <wangcong@zeuux.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 08a6fac1

fs/binfmt_elf.c

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 
			return -EFAULT;

		len = strnlen_user((void __user *)p, MAX_ARG_STRLEN);

		if (!len || len > MAX_ARG_STRLEN)

			return 0;

			return -EINVAL;

		p += len;

	}

	if (__put_user(0, argv))
@@ -268,7 +268,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 
			return -EFAULT;

		len = strnlen_user((void __user *)p, MAX_ARG_STRLEN);

		if (!len || len > MAX_ARG_STRLEN)

			return 0;

			return -EINVAL;

		p += len;

	}

	if (__put_user(0, envp))