Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 394c73d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents c4f4d2f9 3f553b30
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 = {