git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[sfrench/cifs-2.6.git]
/
fs
/
efivarfs
/
file.c
diff --git
a/fs/efivarfs/file.c
b/fs/efivarfs/file.c
index feaa5e182b7b4c71c33aa712646dc87e9a67c49f..e6bc0302643bb8c6dac0c5975a1e6f99ccf97033 100644
(file)
--- a/
fs/efivarfs/file.c
+++ b/
fs/efivarfs/file.c
@@
-137,7
+137,7
@@
efivarfs_ioc_setxflags(struct file *file, void __user *arg)
unsigned int oldflags = efivarfs_getflags(inode);
int error;
- if (!inode_owner_or_capable(inode))
+ if (!inode_owner_or_capable(
&init_user_ns,
inode))
return -EACCES;
if (copy_from_user(&flags, arg, sizeof(flags)))