Skip to content

Commit

Permalink
Merge tag 'modules-for-v4.16-rc7' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/kernel/git/jeyu/linux

Pull modules fix from Jessica Yu:
 "Propagate error in modules_open() to avoid possible later NULL
  dereference if seq_open() had failed"

* tag 'modules-for-v4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: propagate error in modules_open()
  • Loading branch information
torvalds committed Mar 22, 2018
2 parents c4f4d2f + 3f553b3 commit 394c73d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -4228,7 +4228,7 @@ static int modules_open(struct inode *inode, struct file *file)
m->private = kallsyms_show_value() ? NULL : (void *)8ul;
}

return 0;
return err;
}

static const struct file_operations proc_modules_operations = {
Expand Down

0 comments on commit 394c73d

Please sign in to comment.