summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-17 13:45:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-17 13:45:57 -0800
commitd46bc34da9bcdab815c4972ad0d433af8eb98c8a (patch)
treef50ae5a5b8feb8d664c5be0fb215d39df8d7a318 /fs
parent5d1904204c99596b50a700f092fe49d78edba400 (diff)
parent19ff7fcc76e6911a955742b40f85ba1030ccba5e (diff)
downloadlinux-d46bc34da9bcdab815c4972ad0d433af8eb98c8a.tar.bz2
Merge tag 'for-linus-4.9-rc5-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs fix from Mike Marshall: "orangefs: add .owner to debugfs file_operations Without ".owner = THIS_MODULE" it is possible to crash the kernel by unloading the Orangefs module while someone is reading debugfs files" * tag 'for-linus-4.9-rc5-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: orangefs: add .owner to debugfs file_operations
Diffstat (limited to 'fs')
-rw-r--r--fs/orangefs/orangefs-debugfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index d484068ca716..38887cc5577f 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -114,6 +114,7 @@ static const struct seq_operations help_debug_ops = {
};
const struct file_operations debug_help_fops = {
+ .owner = THIS_MODULE,
.open = orangefs_debug_help_open,
.read = seq_read,
.release = seq_release,
@@ -121,6 +122,7 @@ const struct file_operations debug_help_fops = {
};
static const struct file_operations kernel_debug_fops = {
+ .owner = THIS_MODULE,
.open = orangefs_debug_open,
.read = orangefs_debug_read,
.write = orangefs_debug_write,