mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Rediff against 2.6.23-rc1.

Browse source
This commit is contained in:
Andreas Gruenbacher 2007-07-23 12:36:24 +00:00
parent 5bd8083759
commit 6d15b4eba7
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
kernel-patches/for-mainline/vfs-setxattr.diff
View file

@ -16,7 +16,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -396,7 +396,8 @@ static ssize_t nfsd_getxattr(struct dent
@@ -413,7 +413,8 @@ static ssize_t nfsd_getxattr(struct dent
#if defined(CONFIG_NFSD_V4)
static int
@ -26,7 +26,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
{
int len;
size_t buflen;
@@ -415,7 +416,7 @@ set_nfsv4_acl_one(struct dentry *dentry,
@@ -432,7 +433,7 @@ set_nfsv4_acl_one(struct dentry *dentry,
goto out;
}
@ -35,7 +35,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
out:
kfree(buf);
return error;
@@ -428,6 +429,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
@@ -445,6 +446,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
__be32 error;
int host_error;
struct dentry *dentry;
@ -43,15 +43,15 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
struct inode *inode;
struct posix_acl *pacl = NULL, *dpacl = NULL;
unsigned int flags = 0;
@@ -438,6 +440,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
goto out;
@@ -455,6 +457,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
return error;
dentry = fhp->fh_dentry;
+ mnt = fhp->fh_export->ex_mnt;
inode = dentry->d_inode;
if (S_ISDIR(inode->i_mode))
flags = NFS4_ACL_DIR;
@@ -449,12 +452,14 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
@@ -465,12 +468,14 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
} else if (host_error < 0)
goto out_nfserr;
@ -59,16 +59,16 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
+ host_error = set_nfsv4_acl_one(dentry, mnt, pacl,
+ POSIX_ACL_XATTR_ACCESS);
if (host_error < 0)
goto out_nfserr;
goto out_release;
if (S_ISDIR(inode->i_mode)) {
if (S_ISDIR(inode->i_mode))
- host_error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT);
+ host_error = set_nfsv4_acl_one(dentry, mnt, dpacl,
+ POSIX_ACL_XATTR_DEFAULT);
if (host_error < 0)
goto out_nfserr;
}
@@ -1998,7 +2003,8 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
out_release:
posix_acl_release(pacl);
@@ -2013,7 +2018,8 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
size = 0;
if (size)
@ -80,7 +80,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
error = 0;
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -69,8 +69,8 @@ xattr_permission(struct inode *inode, co
@@ -68,8 +68,8 @@ xattr_permission(struct inode *inode, co
}
int
@ -91,7 +91,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
{
struct inode *inode = dentry->d_inode;
int error;
@@ -193,8 +193,8 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
@@ -192,8 +192,8 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
static long
@ -102,7 +102,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
{
int error;
void *kvalue = NULL;
@@ -221,7 +221,7 @@ setxattr(struct dentry *d, char __user *
@@ -220,7 +220,7 @@ setxattr(struct dentry *d, char __user *
}
}
@ -111,7 +111,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
kfree(kvalue);
return error;
}
@@ -236,7 +236,7 @@ sys_setxattr(char __user *path, char __u
@@ -235,7 +235,7 @@ sys_setxattr(char __user *path, char __u
error = user_path_walk(path, &nd);
if (error)
return error;
@ -120,7 +120,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
path_release(&nd);
return error;
}
@@ -251,7 +251,7 @@ sys_lsetxattr(char __user *path, char __
@@ -250,7 +250,7 @@ sys_lsetxattr(char __user *path, char __
error = user_path_walk_link(path, &nd);
if (error)
return error;
@ -129,7 +129,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
path_release(&nd);
return error;
}
@@ -269,7 +269,7 @@ sys_fsetxattr(int fd, char __user *name,
@@ -268,7 +268,7 @@ sys_fsetxattr(int fd, char __user *name,
return error;
dentry = f->f_path.dentry;
audit_inode(NULL, dentry->d_inode);