exec: Simplify remove_arg_zero() error path
Subsystems (3)
PATCH 1/1 exec: Simplify remove_arg_zero() error path
We don't need the "out" label any more, so remove "ret" and return directly on error.
Signed-off-by Kees Cook <[email protected]>
---
Cc: Eric Biederman <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Christian Brauner <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- fs/exec.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
fs/exec.c +3 -7
@@ -1720,7 +1720,6 @@ static int prepare_binprm(struct linux_binprm *bprm)*/ int remove_arg_zero (struct linux_binprm *bprm) { -int ret =0 ;unsigned long offset;char *kaddr;struct page *page;
@@ -1731,10 +1730,8 @@ int remove_arg_zero(struct linux_binprm *bprm) do { offset = bprm->p & ~PAGE_MASK; page = get_arg_page(bprm, bprm->p, 0); - if (!page) { - ret = -EFAULT; - goto out; - } + if (!page) + return -EFAULT; kaddr = kmap_local_page(page); for (; offset < PAGE_SIZE && kaddr[offset];
@@ -1748,8 +1745,7 @@ int remove_arg_zero(struct linux_binprm *bprm) bprm->p++; bprm->argc--; -out: -return ret; +return 0 ; }EXPORT_SYMBOL (remove_arg_zero);
Signature · 1 line
2.34.1
Quoted 4 lines · Kees Cook
We don't need the "out" label any more, so remove "ret" and return directly on error.
Signed-off-by Kees Cook <[email protected]>
Looks good. Feel free to add:
Reviewed-by Jan Kara <[email protected]>
Honza
Quoted 49 lines
---
Cc: Eric Biederman <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Christian Brauner <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: [email protected]
Cc: [email protected]--- fs/exec.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)fs/exec.c +3
-7@@ -1720,7 +1720,6 @@ static int prepare_binprm(struct linux_binprm *bprm)*/ int remove_arg_zero (struct linux_binprm *bprm) { -int ret =0 ;unsigned long offset;char *kaddr;struct page *page;@@ -1731,10 +1730,8 @@ int remove_arg_zero(struct linux_binprm *bprm) do { offset = bprm->p & ~PAGE_MASK; page = get_arg_page(bprm, bprm->p, 0); - if (!page) { - ret = -EFAULT; - goto out; - } + if (!page) + return -EFAULT; kaddr = kmap_local_page(page); for (; offset < PAGE_SIZE && kaddr[offset];@@ -1748,8 +1745,7 @@ int remove_arg_zero(struct linux_binprm *bprm) bprm->p++; bprm->argc--; -out: -return ret; +return 0 ; }EXPORT_SYMBOL (remove_arg_zero);Signature · 1 line
2.34.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR