projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI: tegra: Add debugfs support
[firefly-linux-kernel-4.4.55.git]
/
fs
/
namei.c
diff --git
a/fs/namei.c
b/fs/namei.c
index 80168273396bbaeb4490677854fe34d637a78551..985c6f3684859e17439d62c7d319611305414437 100644
(file)
--- a/
fs/namei.c
+++ b/
fs/namei.c
@@
-332,10
+332,11
@@
int generic_permission(struct inode *inode, int mask)
if (S_ISDIR(inode->i_mode)) {
/* DACs are overridable for directories */
if (S_ISDIR(inode->i_mode)) {
/* DACs are overridable for directories */
- if (
inode_capable
(inode, CAP_DAC_OVERRIDE))
+ if (
capable_wrt_inode_uidgid
(inode, CAP_DAC_OVERRIDE))
return 0;
if (!(mask & MAY_WRITE))
return 0;
if (!(mask & MAY_WRITE))
- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
+ if (capable_wrt_inode_uidgid(inode,
+ CAP_DAC_READ_SEARCH))
return 0;
return -EACCES;
}
return 0;
return -EACCES;
}
@@
-345,7
+346,7
@@
int generic_permission(struct inode *inode, int mask)
* at least one exec bit set.
*/
if (!(mask & MAY_EXEC) || (inode->i_mode & S_IXUGO))
* at least one exec bit set.
*/
if (!(mask & MAY_EXEC) || (inode->i_mode & S_IXUGO))
- if (
inode_capable
(inode, CAP_DAC_OVERRIDE))
+ if (
capable_wrt_inode_uidgid
(inode, CAP_DAC_OVERRIDE))
return 0;
/*
return 0;
/*
@@
-353,7
+354,7
@@
int generic_permission(struct inode *inode, int mask)
*/
mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
if (mask == MAY_READ)
*/
mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
if (mask == MAY_READ)
- if (
inode_capable
(inode, CAP_DAC_READ_SEARCH))
+ if (
capable_wrt_inode_uidgid
(inode, CAP_DAC_READ_SEARCH))
return 0;
return -EACCES;
return 0;
return -EACCES;
@@
-2379,7
+2380,7
@@
static inline int check_sticky(struct inode *dir, struct inode *inode)
return 0;
if (uid_eq(dir->i_uid, fsuid))
return 0;
return 0;
if (uid_eq(dir->i_uid, fsuid))
return 0;
- return !
inode_capable
(inode, CAP_FOWNER);
+ return !
capable_wrt_inode_uidgid
(inode, CAP_FOWNER);
}
/*
}
/*