mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 08:45:22 +00:00
ad6613c960
Patch series refreshed against 2.6.24 + - fix-rcu-deref.diff: change way rcu cast is done - fix-name-errorpath.diff: fix bug in failed pathname reporting - fix-net.diff: fix bug in network mediation - apparmor-fix-sysctl-refcount.diff - fix ref count bug in sysctl mediation - apparmor-bootdisable.diff - allow apparmor to be disabled at boot - apparmor-builtin-only.diff - apparmor as a builtin only - split_init.diff - split apparmor initialization into early & apparmorfs
32 lines
813 B
Diff
32 lines
813 B
Diff
From: Andreas Gruenbacher <agruen@suse.de>
|
|
Subject: Fix file_permission()
|
|
|
|
We cannot easily switch from file_permission() to vfs_permission()
|
|
everywhere, so fix file_permission() to not use a NULL nameidata
|
|
for the remaining users.
|
|
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
|
|
|
---
|
|
fs/namei.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/fs/namei.c
|
|
+++ b/fs/namei.c
|
|
@@ -313,7 +313,13 @@ int vfs_permission(struct nameidata *nd,
|
|
*/
|
|
int file_permission(struct file *file, int mask)
|
|
{
|
|
- return permission(file->f_path.dentry->d_inode, mask, NULL);
|
|
+ struct nameidata nd;
|
|
+
|
|
+ nd.dentry = file->f_path.dentry;
|
|
+ nd.mnt = file->f_path.mnt;
|
|
+ nd.flags = LOOKUP_ACCESS;
|
|
+
|
|
+ return permission(nd.dentry->d_inode, mask, &nd);
|
|
}
|
|
|
|
/*
|