Attachment 144111 Details for Bug 219900 – Patch fixing the problem

[patch] Patch fixing the problem

fix_selinux.diff (text/plain), 2.14 KB, created by Paul Dickson on 2006-12-20 15:37:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Dickson

Created: 2006-12-20 15:37:26 UTC

Size: 2.14 KB

patch

obsolete

>commit 2a1edc8201f02109fb084fbee64170cd0e974bb0
>Author: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date:   Tue Dec 19 08:58:26 2006 -0500
>
>    NFS: Ensure we support selinux xattrs
>    
>    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>---
> fs/nfs/nfs3acl.c  |   13 +++++++++++++
> fs/nfs/nfs4proc.c |   14 ++++++++++++++
> 2 files changed, 27 insertions(+), 0 deletions(-)
>
>diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
>index 7322da4..5970e7b 100644
>--- a/fs/nfs/nfs3acl.c
>+++ b/fs/nfs/nfs3acl.c
>@@ -4,6 +4,9 @@ #include <linux/nfs3.h>
> #include <linux/nfs_fs.h>
> #include <linux/posix_acl_xattr.h>
> #include <linux/nfsacl.h>
>+#include <linux/security.h>
>+#include <linux/xattr.h>
>+#include <linux/fsnotify.h>
> 
> #define NFSDBG_FACILITY	NFSDBG_PROC
> 
>@@ -82,6 +85,16 @@ int nfs3_setxattr(struct dentry *dentry,
> 	struct posix_acl *acl;
> 	int type, error;
> 
>+	/* Selinux support */
>+	if (!strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN)) {
>+		const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
>+		error = security_inode_setsecurity(inode, suffix, value,
>+				size, flags);
>+		if (!error)
>+			fsnotify_xattr(dentry);
>+		return error;
>+	}
>+
> 	if (strcmp(name, POSIX_ACL_XATTR_ACCESS) == 0)
> 		type = ACL_TYPE_ACCESS;
> 	else if (strcmp(name, POSIX_ACL_XATTR_DEFAULT) == 0)
>diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
>index 1712d03..f008eb4 100644
>--- a/fs/nfs/nfs4proc.c
>+++ b/fs/nfs/nfs4proc.c
>@@ -48,6 +48,9 @@ #include <linux/nfs_page.h>
> #include <linux/smp_lock.h>
> #include <linux/namei.h>
> #include <linux/mount.h>
>+#include <linux/security.h>
>+#include <linux/xattr.h>
>+#include <linux/fsnotify.h>
> 
> #include "nfs4_fs.h"
> #include "delegation.h"
>@@ -3506,6 +3509,17 @@ int nfs4_setxattr(struct dentry *dentry,
> {
> 	struct inode *inode = dentry->d_inode;
> 
>+	/* Selinux support */
>+	if (!strncmp(key, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN)) {
>+		const char *suffix = key + XATTR_SECURITY_PREFIX_LEN;
>+		int error;
>+		error = security_inode_setsecurity(inode, suffix, buf,
>+				buflen, flags);
>+		if (!error)
>+			fsnotify_xattr(dentry);
>+		return error;
>+	}
>+
> 	if (strcmp(key, XATTR_NAME_NFSV4_ACL) != 0)
> 		return -EOPNOTSUPP;
> 
>

Actions: View | Diff

Attachments on bug 219900: 144111