mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-01 06:46:35 +01:00
exec: binfmt_misc: fix race between load_misc_binary() and kill_node()
load_misc_binary() makes a local copy of fmt->interpreter under entries_lock to avoid the race with kill_node() but this is not enough; the whole Node can be freed after we drop entries_lock, not only the ->interpreter string. Add dget/dput(fmt->dentry) to ensure bm_evict_inode() can't destroy/free this Node. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Oleg Nesterov <[email protected]> Acked-by: Kees Cook <[email protected]> Cc: Al Viro <[email protected]> Cc: Ben Woodard <[email protected]> Cc: James Bottomley <[email protected]> Cc: Jim Foraker <[email protected]> Cc: Travis Gummels <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
1 parent
eb23aa0317
commit
43a4f26190
1 file changed
+8
-4
+8
-4
@@ -138,20 +138,23 @@ static int load_misc_binary(struct linux_binprm *bprm)
|
||||
|
||||
retval = -ENOEXEC;
|
||||
if (!enabled)
|
||||
goto ret;
|
||||
return retval;
|
||||
|
||||
/* to keep locking time low, we copy the interpreter string */
|
||||
read_lock(&entries_lock);
|
||||
fmt = check_file(bprm);
|
||||
if (fmt)
|
||||
if (fmt) {
|
||||
dget(fmt->dentry);
|
||||
strlcpy(iname, fmt->interpreter, BINPRM_BUF_SIZE);
|
||||
}
|
||||
read_unlock(&entries_lock);
|
||||
if (!fmt)
|
||||
goto ret;
|
||||
return retval;
|
||||
|
||||
/* Need to be able to load the file after exec */
|
||||
retval = -ENOENT;
|
||||
if (bprm->interp_flags & BINPRM_FLAGS_PATH_INACCESSIBLE)
|
||||
return -ENOENT;
|
||||
goto ret;
|
||||
|
||||
if (!(fmt->flags & MISC_FMT_PRESERVE_ARGV0)) {
|
||||
retval = remove_arg_zero(bprm);
|
||||
@@ -238,6 +241,7 @@ static int load_misc_binary(struct linux_binprm *bprm)
|
||||
goto error;
|
||||
|
||||
ret:
|
||||
dput(fmt->dentry);
|
||||
return retval;
|
||||
error:
|
||||
if (fd_binary > 0)
|
||||
|
||||
Reference in new issue
Block a user