Merge tag 'modules-for-v4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

torvalds · torvalds · commit 394c73d39628 · 2018-03-22T16:13:49.000-07:00
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()
diff --git 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 = {

Original file line number	Diff line number	Diff line change
`@@ -4228,7 +4228,7 @@ static int modules_open(struct inode inode, struct file file)`
`4228`	`4228`	`m->private = kallsyms_show_value() ? NULL : (void *)8ul;`
`4229`	`4229`	`}`
`4230`	`4230`
`4231`		`- return 0;`
	`4231`	`+ return err;`
`4232`	`4232`	`}`
`4233`	`4233`
`4234`	`4234`	`static const struct file_operations proc_modules_operations = {`