exec: NULL out bprm->argv0 when it is an ERR_PTR
Subsystems (3)
Kees Cook
maintainerPATCH 1/1 exec: NULL out bprm->argv0 when it is an ERR_PTR
Attempting to free an ERR_PTR will not work. ;)
process 'syz-executor210' launched '/dev/fd/3' with NULL argv: empty string added kernel BUG at arch/x86/mm/physaddr.c:23!
Set bprm->argv0 to NULL if it fails to get a string from userspace so that bprm_free() will not try to free an invalid pointer when cleaning up.
---
Cc: Alexander Viro <[email protected]>
Cc: Christian Brauner <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Eric Biederman <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- fs/exec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/exec.c +6 -2
@@ -1522,8 +1522,12 @@ static int bprm_add_fixup_comm(struct linux_binprm *bprm,return 0 ; bprm->argv0 =strndup_user (p,MAX_ARG_STRLEN ); -if (IS_ERR (bprm->argv0)) -return PTR_ERR (bprm->argv0); +if (IS_ERR (bprm->argv0)) { +int rc =PTR_ERR (bprm->argv0); + + bprm->argv0 =NULL ; +return rc; + }return 0 ; }
Signature · 1 line
2.34.1
Quoted 5 lines · Kees Cook
Attempting to free an
ERR_PTRwill not work. ;)process 'syz-executor210' launched '
/dev/fd/3' with NULL argv: empty string added kernel BUG atarch/x86/mm/physaddr.c:23!
Quoted 7 lines
Set
bprm->argv0to NULL if it fails to get a string from userspace so thatbprm_free()will not try to free an invalid pointer when cleaning up.Reported-by [email protected]Fixes 7bdc6fc85c9a ("exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case")Signed-off-by Kees Cook <[email protected]>
Thanks.
Quoted 12 lines · Kees Cook
Attempting to free an
ERR_PTRwill not work. ;)process 'syz-executor210' launched '
/dev/fd/3' with NULL argv: empty string added kernel BUG atarch/x86/mm/physaddr.c:23!Set
bprm->argv0to NULL if it fails to get a string from userspace so thatbprm_free()will not try to free an invalid pointer when cleaning up.Reported-by [email protected]Fixes 7bdc6fc85c9a ("exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case")Signed-off-by Kees Cook <[email protected]>
Quoted 7 lines
---
Cc: Alexander Viro <[email protected]>
Cc: Christian Brauner <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Eric Biederman <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
Quoted 5 lines · Kees Cook
Attempting to free an
ERR_PTRwill not work. ;)process 'syz-executor210' launched '
/dev/fd/3' with NULL argv: empty string added kernel BUG atarch/x86/mm/physaddr.c:23!
Quoted 8 lines
Set
bprm->argv0to NULL if it fails to get a string from userspace so thatbprm_free()will not try to free an invalid pointer when cleaning up.Reported-by [email protected]Fixes 7bdc6fc85c9a ("exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case")Signed-off-by Kees Cook <[email protected]>---