Commit 83f91827 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

exec: binfmt_misc: shift filp_close(interp_file) from kill_node() to bm_evict_inode()

To ensure that load_misc_binary() can't use the partially destroyed
Node, see also the next patch.

The current logic looks wrong in any case, once we close interp_file it
doesn't make any sense to delay kfree(inode->i_private), this Node is no
longer valid.  Even if the MISC_FMT_OPEN_FILE/interp_file checks were
not racy (they are), load_misc_binary() should not try to reopen
->interpreter if MISC_FMT_OPEN_FILE is set but ->interp_file is NULL.

And I can't understand why do we use filp_close(), not fput().

Link: default avatarOleg Nesterov <>
Acked-by: default avatarKees Cook <>
Cc: Al Viro <>
Cc: Ben Woodard <>
Cc: James Bottomley <>
Cc: Jim Foraker <>
Cc: <>
Cc: Travis Gummels <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent baba1b29
......@@ -594,8 +594,13 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode)
static void bm_evict_inode(struct inode *inode)
Node *e = inode->i_private;
if ((e->flags & MISC_FMT_OPEN_FILE) && e->interp_file)
filp_close(e->interp_file, NULL);
static void kill_node(Node *e)
......@@ -606,11 +611,6 @@ static void kill_node(Node *e)
if ((e->flags & MISC_FMT_OPEN_FILE) && e->interp_file) {
filp_close(e->interp_file, NULL);
e->interp_file = NULL;
dentry = e->dentry;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment