[PATCH 47/52] CRED: Pass credentials through the xattr get() handler

[David Howells <dhowells@redhat.com>]

Pass credentials through the xattr get() handler.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 fs/ext3/acl.c            |    4 ++--
 fs/ext3/xattr_security.c |    2 +-
 fs/ext3/xattr_trusted.c  |    2 +-
 fs/ext3/xattr_user.c     |    2 +-
 fs/xattr.c               |    3 ++-
 include/linux/xattr.h    |    2 +-
 mm/shmem.c               |    3 ++-
 mm/shmem_acl.c           |    4 ++--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 0f7fd74..0ce1d87 100644
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -466,7 +466,7 @@ ext3_xattr_get_acl(struct inode *inode, int type, void *buffer, size_t size)
 
 static int
 ext3_xattr_get_acl_access(struct inode *inode, const char *name,
-			  void *buffer, size_t size)
+			  void *buffer, size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") != 0)
 		return -EINVAL;
@@ -475,7 +475,7 @@ ext3_xattr_get_acl_access(struct inode *inode, const char *name,
 
 static int
 ext3_xattr_get_acl_default(struct inode *inode, const char *name,
-			   void *buffer, size_t size)
+			   void *buffer, size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") != 0)
 		return -EINVAL;
diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index 351bbb8..7d01840 100644
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -29,7 +29,7 @@ ext3_xattr_security_list(struct inode *inode, char *list, size_t list_size,
 
 static int
 ext3_xattr_security_get(struct inode *inode, const char *name,
-		       void *buffer, size_t size)
+			void *buffer, size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c
index d086115..6073729 100644
--- a/fs/ext3/xattr_trusted.c
+++ b/fs/ext3/xattr_trusted.c
@@ -35,7 +35,7 @@ ext3_xattr_trusted_list(struct inode *inode, char *list, size_t list_size,
 
 static int
 ext3_xattr_trusted_get(struct inode *inode, const char *name,
-		       void *buffer, size_t size)
+		       void *buffer, size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c
index afbfc4d..f8a7663 100644
--- a/fs/ext3/xattr_user.c
+++ b/fs/ext3/xattr_user.c
@@ -34,7 +34,7 @@ ext3_xattr_user_list(struct inode *inode, char *list, size_t list_size,
 
 static int
 ext3_xattr_user_get(struct inode *inode, const char *name,
-		    void *buffer, size_t size)
+		    void *buffer, size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
diff --git a/fs/xattr.c b/fs/xattr.c
index 257305e..634f0b1 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -545,13 +545,14 @@ xattr_resolve_name(struct xattr_handler **handlers, const char **name)
 ssize_t
 generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size)
 {
+	struct cred *cred = current->cred;
 	struct xattr_handler *handler;
 	struct inode *inode = dentry->d_inode;
 
 	handler = xattr_resolve_name(inode->i_sb->s_xattr, &name);
 	if (!handler)
 		return -EOPNOTSUPP;
-	return handler->get(inode, name, buffer, size);
+	return handler->get(inode, name, buffer, size, cred);
 }
 
 /*
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index dd98be1..a5002eb 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -41,7 +41,7 @@ struct xattr_handler {
 	size_t (*list)(struct inode *inode, char *list, size_t list_size,
 		       const char *name, size_t name_len);
 	int (*get)(struct inode *inode, const char *name, void *buffer,
-		   size_t size);
+		   size_t size, struct cred *cred);
 	int (*set)(struct inode *inode, const char *name, const void *buffer,
 		   size_t size, int flags, struct cred *cred);
 };
diff --git a/mm/shmem.c b/mm/shmem.c
index a3c2007..45cc69e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1967,7 +1967,8 @@ static size_t shmem_xattr_security_list(struct inode *inode, char *list,
 }
 
 static int shmem_xattr_security_get(struct inode *inode, const char *name,
-				    void *buffer, size_t size)
+				    void *buffer, size_t size,
+				    struct cred *cred)
 {
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
diff --git a/mm/shmem_acl.c b/mm/shmem_acl.c
index f78720f..7685a67 100644
--- a/mm/shmem_acl.c
+++ b/mm/shmem_acl.c
@@ -79,7 +79,7 @@ shmem_list_acl_access(struct inode *inode, char *list, size_t list_size,
 
 static int
 shmem_get_acl_access(struct inode *inode, const char *name, void *buffer,
-		     size_t size)
+		     size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") != 0)
 		return -EINVAL;
@@ -120,7 +120,7 @@ shmem_list_acl_default(struct inode *inode, char *list, size_t list_size,
 
 static int
 shmem_get_acl_default(struct inode *inode, const char *name, void *buffer,
-		      size_t size)
+		      size_t size, struct cred *cred)
 {
 	if (strcmp(name, "") != 0)
 		return -EINVAL;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/