diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-11 00:31:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-11 00:31:58 -0400 |
commit | c8d6637d0497d62093dbba0694c7b3a80b79bfe1 (patch) | |
tree | 4ef432511fa6fa959429e1fc961fb186f1745e54 /arch/powerpc/platforms/powernv/opal-dump.c | |
parent | 801a71a858631109a64bf30b1c480b0a18386605 (diff) | |
parent | 76215b04fd297c008b91ece732ed36e67e0181fa (diff) |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell:
"This finally applies the stricter sysfs perms checking we pulled out
before last merge window. A few stragglers are fixed (thanks
linux-next!)"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
arch/powerpc/platforms/powernv/opal-dump.c: fix world-writable sysfs files
arch/powerpc/platforms/powernv/opal-elog.c: fix world-writable sysfs files
drivers/video/fbdev/s3c2410fb.c: don't make debug world-writable.
ARM: avoid ARM binutils leaking ELF local symbols
scripts: modpost: Remove numeric suffix pattern matching
scripts: modpost: fix compilation warning
sysfs: disallow world-writable files.
module: return bool from within_module*()
module: add within_module() function
modules: Fix build error in moduleloader.h
Diffstat (limited to 'arch/powerpc/platforms/powernv/opal-dump.c')
-rw-r--r-- | arch/powerpc/platforms/powernv/opal-dump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c index 788a1977b9a5..85bb8fff7947 100644 --- a/arch/powerpc/platforms/powernv/opal-dump.c +++ b/arch/powerpc/platforms/powernv/opal-dump.c | |||
@@ -102,9 +102,9 @@ static ssize_t dump_ack_store(struct dump_obj *dump_obj, | |||
102 | * due to the dynamic size of the dump | 102 | * due to the dynamic size of the dump |
103 | */ | 103 | */ |
104 | static struct dump_attribute id_attribute = | 104 | static struct dump_attribute id_attribute = |
105 | __ATTR(id, 0666, dump_id_show, NULL); | 105 | __ATTR(id, S_IRUGO, dump_id_show, NULL); |
106 | static struct dump_attribute type_attribute = | 106 | static struct dump_attribute type_attribute = |
107 | __ATTR(type, 0666, dump_type_show, NULL); | 107 | __ATTR(type, S_IRUGO, dump_type_show, NULL); |
108 | static struct dump_attribute ack_attribute = | 108 | static struct dump_attribute ack_attribute = |
109 | __ATTR(acknowledge, 0660, dump_ack_show, dump_ack_store); | 109 | __ATTR(acknowledge, 0660, dump_ack_show, dump_ack_store); |
110 | 110 | ||