diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-22 16:13:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-22 16:13:49 -0700 |
| commit | 394c73d396284897207dbb1bad2a43e621cb9dac (patch) | |
| tree | 13e4e2499818ad8c5919c8eed93996b3b5c88742 /kernel | |
| parent | c4f4d2f917729e9b7b8bb452bf4971be93e7a15f (diff) | |
| parent | 3f553b308bb004eb730da8e00a28150c157c7724 (diff) | |
Merge tag 'modules-for-v4.16-rc7' of git://git.kernel.org/pub/scm/linux/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()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index ad2d420024f6..e42764acedb4 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -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 = { |