Skip to contentSkip to conversation

Add flags option to get xattr method paired to __vfs_getxattr

PATCH Superseded Mark Salyzyn 4 participants 4 messages Aug 15, 2019 – Aug 16, 2019

Subsystems (35)

v4 of 18 Superseded Latest is v18 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 Add flags option to get xattr method paired to __vfs_getxattr

Add a flag option to get xattr method that could have a bit flag of XATTR_NOSECURITY passed to it. XATTR_NOSECURITY is generally then set in the __vfs_getxattr path.

This handles the case of a union filesystem driver that is being requested by the security layer to report back the xattr data.

For the use case where access is to be blocked by the security layer.

The path then could be security(dentry) -> __vfs_getxattr(dentry...XATTR_NOSECUIRTY) -> handler->get(dentry...XATTR_NOSECURITY) -> __vfs_getxattr(lower_dentry...XATTR_NOSECUIRTY) -> lower_handler->get(lower_dentry...XATTR_NOSECUIRTY) which would report back through the chain data and success as expected, the logging security layer at the top would have the data to determine the access permissions and report back the target context that was blocked.

Without the get handler flag, the path on a union filesystem would be the errant security(dentry) -> __vfs_getxattr(dentry) -> handler->get(dentry) -> vfs_getxattr(lower_dentry) -> nested -> security(lower_dentry, log off) -> lower_handler->get(lower_dentry) which would report back through the chain no data, and -EACCES.

For selinux for both cases, this would translate to a correctly determined blocked access. In the first case with this change a correct avc log would be reported, in the second legacy case an incorrect avc log would be reported against an uninitialized u:object_r:unlabeled:s0 context making the logs cosmetically useless for audit2allow.

This patch series is inert and is the wide-spread addition of the flags option for xattr functions, and a replacement of _vfs_getxattr with __vfs_getxattr(...XATTR_NOSECURITY).

---
v4:
- ifdef __KERNEL__ around XATTR_NOSECURITY to
keep it colocated in uapi headers.

v3:
- poor aim on ubifs not ubifs_xattr_get, but static xattr_get

v2:
- Missed a spot: ubifs, erofs and afs.

v1:
- Removed from an overlayfs patch set, and made independent. Expect this to be the basis of some security improvements.

---
 drivers/staging/erofs/xattr.c     |  3 ++-
 fs/9p/acl.c                       |  3 ++-
 fs/9p/xattr.c                     |  3 ++-
 fs/afs/xattr.c                    |  8 +++----
 fs/btrfs/xattr.c                  |  3 ++-
 fs/ceph/xattr.c                   |  3 ++-
 fs/cifs/xattr.c                   |  2 +-
 fs/ecryptfs/inode.c               |  6 ++++--
 fs/ecryptfs/mmap.c                |  2 +-
 fs/ext2/xattr_trusted.c           |  2 +-
 fs/ext2/xattr_user.c              |  2 +-
 fs/ext4/xattr_security.c          |  2 +-
 fs/ext4/xattr_trusted.c           |  2 +-
 fs/ext4/xattr_user.c              |  2 +-
 fs/f2fs/xattr.c                   |  4 ++--
 fs/fuse/xattr.c                   |  4 ++--
 fs/gfs2/xattr.c                   |  3 ++-
 fs/hfs/attr.c                     |  2 +-
 fs/hfsplus/xattr.c                |  3 ++-
 fs/hfsplus/xattr_trusted.c        |  3 ++-
 fs/hfsplus/xattr_user.c           |  3 ++-
 fs/jffs2/security.c               |  3 ++-
 fs/jffs2/xattr_trusted.c          |  3 ++-
 fs/jffs2/xattr_user.c             |  3 ++-
 fs/jfs/xattr.c                    |  5 +++--
 fs/kernfs/inode.c                 |  3 ++-
 fs/nfs/nfs4proc.c                 |  6 ++++--
 fs/ocfs2/xattr.c                  |  9 +++++---
 fs/orangefs/xattr.c               |  3 ++-
 fs/overlayfs/super.c              |  8 ++++---
 fs/posix_acl.c                    |  2 +-
 fs/reiserfs/xattr_security.c      |  3 ++-
 fs/reiserfs/xattr_trusted.c       |  3 ++-
 fs/reiserfs/xattr_user.c          |  3 ++-
 fs/squashfs/xattr.c               |  2 +-
 fs/ubifs/xattr.c                  |  3 ++-
 fs/xattr.c                        | 36 +++++++++++++++----------------
 fs/xfs/xfs_xattr.c                |  3 ++-
 include/linux/xattr.h             |  9 ++++----
 include/uapi/linux/xattr.h        |  7 ++++--
 mm/shmem.c                        |  3 ++-
 net/socket.c                      |  3 ++-
 security/commoncap.c              |  6 ++++--
 security/integrity/evm/evm_main.c |  3 ++-
 security/selinux/hooks.c          | 11 ++++++----
 security/smack/smack_lsm.c        |  5 +++--
 46 files changed, 126 insertions(+), 84 deletions(-)
drivers/staging/erofs/xattr.c +2 -1
index df40654b9fbb..69440065432c 100644
@@ -463,7 +463,8 @@ int erofs_getxattr(struct inode *inode, int index,
 
 static int erofs_xattr_generic_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
 
fs/9p/acl.c +2 -1
index 6261719f6f2a..cb14e8b312bc 100644
@@ -214,7 +214,8 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep,
 
 static int v9fs_xattr_get_acl(const struct xattr_handler *handler,
 			      struct dentry *dentry, struct inode *inode,
-			      const char *name, void *buffer, size_t size)
+			      const char *name, void *buffer, size_t size,
+			      int flags)
 {
 	struct v9fs_session_info *v9ses;
 	struct posix_acl *acl;
fs/9p/xattr.c +2 -1
index ac8ff8ca4c11..5cfa772452fd 100644
@@ -139,7 +139,8 @@ ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 
 static int v9fs_xattr_handler_get(const struct xattr_handler *handler,
 				  struct dentry *dentry, struct inode *inode,
-				  const char *name, void *buffer, size_t size)
+				  const char *name, void *buffer, size_t size,
+				  int flags)
 {
 	const char *full_name = xattr_full_name(handler, name);
 
fs/afs/xattr.c +4 -4
index 5552d034090a..7e2d97653f5a 100644
@@ -163,7 +163,7 @@ static const struct xattr_handler afs_xattr_afs_acl_handler = {
 static int afs_xattr_get_yfs(const struct xattr_handler *handler,
 			     struct dentry *dentry,
 			     struct inode *inode, const char *name,
-			     void *buffer, size_t size)
+			     void *buffer, size_t size, int flags)
 {
 	struct afs_fs_cursor fc;
 	struct afs_status_cb *scb;
@@ -334,7 +334,7 @@ static const struct xattr_handler afs_xattr_yfs_handler = {
 static int afs_xattr_get_cell(const struct xattr_handler *handler,
 			      struct dentry *dentry,
 			      struct inode *inode, const char *name,
-			      void *buffer, size_t size)
+			      void *buffer, size_t size, int flags)
 {
 	struct afs_vnode *vnode = AFS_FS_I(inode);
 	struct afs_cell *cell = vnode->volume->cell;
@@ -361,7 +361,7 @@ static const struct xattr_handler afs_xattr_afs_cell_handler = {
 static int afs_xattr_get_fid(const struct xattr_handler *handler,
 			     struct dentry *dentry,
 			     struct inode *inode, const char *name,
-			     void *buffer, size_t size)
+			     void *buffer, size_t size, int flags)
 {
 	struct afs_vnode *vnode = AFS_FS_I(inode);
 	char text[16 + 1 + 24 + 1 + 8 + 1];
@@ -397,7 +397,7 @@ static const struct xattr_handler afs_xattr_afs_fid_handler = {
 static int afs_xattr_get_volume(const struct xattr_handler *handler,
 			      struct dentry *dentry,
 			      struct inode *inode, const char *name,
-			      void *buffer, size_t size)
+			      void *buffer, size_t size, int flags)
 {
 	struct afs_vnode *vnode = AFS_FS_I(inode);
 	const char *volname = vnode->volume->name;
fs/btrfs/xattr.c +2 -1
index 95d9aebff2c4..1e522e145344 100644
@@ -353,7 +353,8 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 
 static int btrfs_xattr_handler_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	name = xattr_full_name(handler, name);
 	return btrfs_getxattr(inode, name, buffer, size);
fs/ceph/xattr.c +2 -1
index 37b458a9af3a..edb7eb9ae83e 100644
@@ -1171,7 +1171,8 @@ int __ceph_setxattr(struct inode *inode, const char *name,
 
 static int ceph_get_xattr_handler(const struct xattr_handler *handler,
 				  struct dentry *dentry, struct inode *inode,
-				  const char *name, void *value, size_t size)
+				  const char *name, void *value, size_t size,
+				  int flags)
 {
 	if (!ceph_is_valid_xattr(name))
 		return -EOPNOTSUPP;
fs/cifs/xattr.c +1 -1
index 9076150758d8..7f71c06ce631 100644
@@ -199,7 +199,7 @@ static int cifs_creation_time_get(struct dentry *dentry, struct inode *inode,
 
 static int cifs_xattr_get(const struct xattr_handler *handler,
 			  struct dentry *dentry, struct inode *inode,
-			  const char *name, void *value, size_t size)
+			  const char *name, void *value, size_t size, int flags)
 {
 	ssize_t rc = -EOPNOTSUPP;
 	unsigned int xid;
fs/ecryptfs/inode.c +4 -2
index 18426f4855f1..c710c7533729 100644
@@ -1018,7 +1018,8 @@ ecryptfs_getxattr_lower(struct dentry *lower_dentry, struct inode *lower_inode,
 		goto out;
 	}
 	inode_lock(lower_inode);
-	rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size);
+	rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size,
+			    XATTR_NOSECURITY);
 	inode_unlock(lower_inode);
 out:
 	return rc;
@@ -1103,7 +1104,8 @@ const struct inode_operations ecryptfs_main_iops = {
 
 static int ecryptfs_xattr_get(const struct xattr_handler *handler,
 			      struct dentry *dentry, struct inode *inode,
-			      const char *name, void *buffer, size_t size)
+			      const char *name, void *buffer, size_t size,
+			      int flags)
 {
 	return ecryptfs_getxattr(dentry, inode, name, buffer, size);
 }
fs/ecryptfs/mmap.c +1 -1
index cffa0c1ec829..2362be3e3b4d 100644
@@ -422,7 +422,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode)
 	}
 	inode_lock(lower_inode);
 	size = __vfs_getxattr(lower_dentry, lower_inode, ECRYPTFS_XATTR_NAME,
-			      xattr_virt, PAGE_SIZE);
+			      xattr_virt, PAGE_SIZE, XATTR_NOSECURITY);
 	if (size < 0)
 		size = 8;
 	put_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt);
fs/ext2/xattr_trusted.c +1 -1
index 49add1107850..8d313664f0fa 100644
@@ -18,7 +18,7 @@ ext2_xattr_trusted_list(struct dentry *dentry)
 static int
 ext2_xattr_trusted_get(const struct xattr_handler *handler,
 		       struct dentry *unused, struct inode *inode,
-		       const char *name, void *buffer, size_t size)
+		       const char *name, void *buffer, size_t size, int flags)
 {
 	return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name,
 			      buffer, size);
fs/ext2/xattr_user.c +1 -1
index c243a3b4d69d..712b7c95cc64 100644
@@ -20,7 +20,7 @@ ext2_xattr_user_list(struct dentry *dentry)
 static int
 ext2_xattr_user_get(const struct xattr_handler *handler,
 		    struct dentry *unused, struct inode *inode,
-		    const char *name, void *buffer, size_t size)
+		    const char *name, void *buffer, size_t size, int flags)
 {
 	if (!test_opt(inode->i_sb, XATTR_USER))
 		return -EOPNOTSUPP;
fs/ext4/xattr_security.c +1 -1
index 197a9d8a15ef..50fb71393fb6 100644
@@ -15,7 +15,7 @@
 static int
 ext4_xattr_security_get(const struct xattr_handler *handler,
 			struct dentry *unused, struct inode *inode,
-			const char *name, void *buffer, size_t size)
+			const char *name, void *buffer, size_t size, int flags)
 {
 	return ext4_xattr_get(inode, EXT4_XATTR_INDEX_SECURITY,
 			      name, buffer, size);
fs/ext4/xattr_trusted.c +1 -1
index e9389e5d75c3..64bd8f86c1f1 100644
@@ -22,7 +22,7 @@ ext4_xattr_trusted_list(struct dentry *dentry)
 static int
 ext4_xattr_trusted_get(const struct xattr_handler *handler,
 		       struct dentry *unused, struct inode *inode,
-		       const char *name, void *buffer, size_t size)
+		       const char *name, void *buffer, size_t size, int flags)
 {
 	return ext4_xattr_get(inode, EXT4_XATTR_INDEX_TRUSTED,
 			      name, buffer, size);
fs/ext4/xattr_user.c +1 -1
index d4546184b34b..b7301373820e 100644
@@ -21,7 +21,7 @@ ext4_xattr_user_list(struct dentry *dentry)
 static int
 ext4_xattr_user_get(const struct xattr_handler *handler,
 		    struct dentry *unused, struct inode *inode,
-		    const char *name, void *buffer, size_t size)
+		    const char *name, void *buffer, size_t size, int flags)
 {
 	if (!test_opt(inode->i_sb, XATTR_USER))
 		return -EOPNOTSUPP;
fs/f2fs/xattr.c +2 -2
index b32c45621679..76559da8dfba 100644
@@ -24,7 +24,7 @@
 
 static int f2fs_xattr_generic_get(const struct xattr_handler *handler,
 		struct dentry *unused, struct inode *inode,
-		const char *name, void *buffer, size_t size)
+		const char *name, void *buffer, size_t size, int flags)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
 
@@ -79,7 +79,7 @@ static bool f2fs_xattr_trusted_list(struct dentry *dentry)
 
 static int f2fs_xattr_advise_get(const struct xattr_handler *handler,
 		struct dentry *unused, struct inode *inode,
-		const char *name, void *buffer, size_t size)
+		const char *name, void *buffer, size_t size, int flags)
 {
 	if (buffer)
 		*((char *)buffer) = F2FS_I(inode)->i_advise;
fs/fuse/xattr.c +2 -2
index 433717640f78..d1ef7808304e 100644
@@ -176,7 +176,7 @@ int fuse_removexattr(struct inode *inode, const char *name)
 
 static int fuse_xattr_get(const struct xattr_handler *handler,
 			 struct dentry *dentry, struct inode *inode,
-			 const char *name, void *value, size_t size)
+			 const char *name, void *value, size_t size, int flags)
 {
 	return fuse_getxattr(inode, name, value, size);
 }
@@ -199,7 +199,7 @@ static bool no_xattr_list(struct dentry *dentry)
 
 static int no_xattr_get(const struct xattr_handler *handler,
 			struct dentry *dentry, struct inode *inode,
-			const char *name, void *value, size_t size)
+			const char *name, void *value, size_t size, int flags)
 {
 	return -EOPNOTSUPP;
 }
fs/gfs2/xattr.c +2 -1
index bbe593d16bea..a9db067a99c1 100644
@@ -588,7 +588,8 @@ static int __gfs2_xattr_get(struct inode *inode, const char *name,
 
 static int gfs2_xattr_get(const struct xattr_handler *handler,
 			  struct dentry *unused, struct inode *inode,
-			  const char *name, void *buffer, size_t size)
+			  const char *name, void *buffer, size_t size,
+			  int flags)
 {
 	struct gfs2_inode *ip = GFS2_I(inode);
 	struct gfs2_holder gh;
fs/hfs/attr.c +1 -1
index 74fa62643136..08222a9c5d31 100644
@@ -115,7 +115,7 @@ static ssize_t __hfs_getxattr(struct inode *inode, enum hfs_xattr_type type,
 
 static int hfs_xattr_get(const struct xattr_handler *handler,
 			 struct dentry *unused, struct inode *inode,
-			 const char *name, void *value, size_t size)
+			 const char *name, void *value, size_t size, int flags)
 {
 	return __hfs_getxattr(inode, handler->flags, value, size);
 }
fs/hfsplus/xattr.c +2 -1
index bb0b27d88e50..381c2aaedbc8 100644
@@ -839,7 +839,8 @@ static int hfsplus_removexattr(struct inode *inode, const char *name)
 
 static int hfsplus_osx_getxattr(const struct xattr_handler *handler,
 				struct dentry *unused, struct inode *inode,
-				const char *name, void *buffer, size_t size)
+				const char *name, void *buffer, size_t size,
+				int flags)
 {
 	/*
 	 * Don't allow retrieving properly prefixed attributes
fs/hfsplus/xattr_trusted.c +2 -1
index fbad91e1dada..54d926314f8c 100644
@@ -14,7 +14,8 @@
 
 static int hfsplus_trusted_getxattr(const struct xattr_handler *handler,
 				    struct dentry *unused, struct inode *inode,
-				    const char *name, void *buffer, size_t size)
+				    const char *name, void *buffer,
+				    size_t size, int flags)
 {
 	return hfsplus_getxattr(inode, name, buffer, size,
 				XATTR_TRUSTED_PREFIX,
fs/hfsplus/xattr_user.c +2 -1
index 74d19faf255e..4d2b1ffff887 100644
@@ -14,7 +14,8 @@
 
 static int hfsplus_user_getxattr(const struct xattr_handler *handler,
 				 struct dentry *unused, struct inode *inode,
-				 const char *name, void *buffer, size_t size)
+				 const char *name, void *buffer, size_t size,
+				 int flags)
 {
 
 	return hfsplus_getxattr(inode, name, buffer, size,
fs/jffs2/security.c +2 -1
index c2332e30f218..e6f42fe435af 100644
@@ -50,7 +50,8 @@ int jffs2_init_security(struct inode *inode, struct inode *dir,
 /* ---- XATTR Handler for "security.*" ----------------- */
 static int jffs2_security_getxattr(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_SECURITY,
 				 name, buffer, size);
fs/jffs2/xattr_trusted.c +2 -1
index 5d6030826c52..9dccaae549f5 100644
@@ -18,7 +18,8 @@
 
 static int jffs2_trusted_getxattr(const struct xattr_handler *handler,
 				  struct dentry *unused, struct inode *inode,
-				  const char *name, void *buffer, size_t size)
+				  const char *name, void *buffer, size_t size,
+				  int flags)
 {
 	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED,
 				 name, buffer, size);
fs/jffs2/xattr_user.c +2 -1
index 9d027b4abcf9..c0983a3e810b 100644
@@ -18,7 +18,8 @@
 
 static int jffs2_user_getxattr(const struct xattr_handler *handler,
 			       struct dentry *unused, struct inode *inode,
-			       const char *name, void *buffer, size_t size)
+			       const char *name, void *buffer, size_t size,
+			       int flags)
 {
 	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_USER,
 				 name, buffer, size);
fs/jfs/xattr.c +3 -2
index db41e7803163..5c79a35bf62f 100644
@@ -925,7 +925,7 @@ static int __jfs_xattr_set(struct inode *inode, const char *name,
 
 static int jfs_xattr_get(const struct xattr_handler *handler,
 			 struct dentry *unused, struct inode *inode,
-			 const char *name, void *value, size_t size)
+			 const char *name, void *value, size_t size, int flags)
 {
 	name = xattr_full_name(handler, name);
 	return __jfs_getxattr(inode, name, value, size);
@@ -942,7 +942,8 @@ static int jfs_xattr_set(const struct xattr_handler *handler,
 
 static int jfs_xattr_get_os2(const struct xattr_handler *handler,
 			     struct dentry *unused, struct inode *inode,
-			     const char *name, void *value, size_t size)
+			     const char *name, void *value, size_t size,
+			     int flags)
 {
 	if (is_known_namespace(name))
 		return -EOPNOTSUPP;
fs/kernfs/inode.c +2 -1
index f3f3984cce80..89db24ce644e 100644
@@ -309,7 +309,8 @@ int kernfs_xattr_set(struct kernfs_node *kn, const char *name,
 
 static int kernfs_vfs_xattr_get(const struct xattr_handler *handler,
 				struct dentry *unused, struct inode *inode,
-				const char *suffix, void *value, size_t size)
+				const char *suffix, void *value, size_t size,
+				int flags)
 {
 	const char *name = xattr_full_name(handler, suffix);
 	struct kernfs_node *kn = inode->i_private;
fs/nfs/nfs4proc.c +4 -2
index 1406858bae6c..1905597f86fb 100644
@@ -7218,7 +7218,8 @@ static int nfs4_xattr_set_nfs4_acl(const struct xattr_handler *handler,
 
 static int nfs4_xattr_get_nfs4_acl(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *key, void *buf, size_t buflen)
+				   const char *key, void *buf, size_t buflen,
+				   int flags)
 {
 	return nfs4_proc_get_acl(inode, buf, buflen);
 }
@@ -7243,7 +7244,8 @@ static int nfs4_xattr_set_nfs4_label(const struct xattr_handler *handler,
 
 static int nfs4_xattr_get_nfs4_label(const struct xattr_handler *handler,
 				     struct dentry *unused, struct inode *inode,
-				     const char *key, void *buf, size_t buflen)
+				     const char *key, void *buf, size_t buflen,
+				     int flags)
 {
 	if (security_ismaclabel(key))
 		return nfs4_get_security_label(inode, buf, buflen);
fs/ocfs2/xattr.c +6 -3
index 90c830e3758e..525835807c86 100644
@@ -7242,7 +7242,8 @@ int ocfs2_init_security_and_acl(struct inode *dir,
  */
 static int ocfs2_xattr_security_get(const struct xattr_handler *handler,
 				    struct dentry *unused, struct inode *inode,
-				    const char *name, void *buffer, size_t size)
+				    const char *name, void *buffer, size_t size,
+				    int flags)
 {
 	return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_SECURITY,
 			       name, buffer, size);
@@ -7314,7 +7315,8 @@ const struct xattr_handler ocfs2_xattr_security_handler = {
  */
 static int ocfs2_xattr_trusted_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_TRUSTED,
 			       name, buffer, size);
@@ -7340,7 +7342,8 @@ const struct xattr_handler ocfs2_xattr_trusted_handler = {
  */
 static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
 				struct dentry *unused, struct inode *inode,
-				const char *name, void *buffer, size_t size)
+				const char *name, void *buffer, size_t size,
+				int flags)
 {
 	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
 
fs/orangefs/xattr.c +2 -1
index bdc285aea360..ef4180bff7bb 100644
@@ -541,7 +541,8 @@ static int orangefs_xattr_get_default(const struct xattr_handler *handler,
 				      struct inode *inode,
 				      const char *name,
 				      void *buffer,
-				      size_t size)
+				      size_t size,
+				      int flags)
 {
 	return orangefs_inode_getxattr(inode, name, buffer, size);
 
fs/overlayfs/super.c +5 -3
index b368e2e102fa..a7b21f2ea2dd 100644
@@ -854,7 +854,7 @@ static unsigned int ovl_split_lowerdirs(char *str)
 static int __maybe_unused
 ovl_posix_acl_xattr_get(const struct xattr_handler *handler,
 			struct dentry *dentry, struct inode *inode,
-			const char *name, void *buffer, size_t size)
+			const char *name, void *buffer, size_t size, int flags)
 {
 	return ovl_xattr_get(dentry, inode, handler->name, buffer, size);
 }
@@ -919,7 +919,8 @@ ovl_posix_acl_xattr_set(const struct xattr_handler *handler,
 
 static int ovl_own_xattr_get(const struct xattr_handler *handler,
 			     struct dentry *dentry, struct inode *inode,
-			     const char *name, void *buffer, size_t size)
+			     const char *name, void *buffer, size_t size,
+			     int flags)
 {
 	return -EOPNOTSUPP;
 }
@@ -934,7 +935,8 @@ static int ovl_own_xattr_set(const struct xattr_handler *handler,
 
 static int ovl_other_xattr_get(const struct xattr_handler *handler,
 			       struct dentry *dentry, struct inode *inode,
-			       const char *name, void *buffer, size_t size)
+			       const char *name, void *buffer, size_t size,
+			       int flags)
 {
 	return ovl_xattr_get(dentry, inode, name, buffer, size);
 }
fs/posix_acl.c +1 -1
index 84ad1c90d535..cd55621e570b 100644
@@ -832,7 +832,7 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
 static int
 posix_acl_xattr_get(const struct xattr_handler *handler,
 		    struct dentry *unused, struct inode *inode,
-		    const char *name, void *value, size_t size)
+		    const char *name, void *value, size_t size, int flags)
 {
 	struct posix_acl *acl;
 	int error;
fs/reiserfs/xattr_security.c +2 -1
index 20be9a0e5870..eedfa07a4fd0 100644
@@ -11,7 +11,8 @@
 
 static int
 security_get(const struct xattr_handler *handler, struct dentry *unused,
-	     struct inode *inode, const char *name, void *buffer, size_t size)
+	     struct inode *inode, const char *name, void *buffer, size_t size,
+	     int flags)
 {
 	if (IS_PRIVATE(inode))
 		return -EPERM;
fs/reiserfs/xattr_trusted.c +2 -1
index 5ed48da3d02b..2d11d98605dd 100644
@@ -10,7 +10,8 @@
 
 static int
 trusted_get(const struct xattr_handler *handler, struct dentry *unused,
-	    struct inode *inode, const char *name, void *buffer, size_t size)
+	    struct inode *inode, const char *name, void *buffer, size_t size,
+	    int flags)
 {
 	if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))
 		return -EPERM;
fs/reiserfs/xattr_user.c +2 -1
index a573ca45bacc..2a59d85c69c9 100644
@@ -9,7 +9,8 @@
 
 static int
 user_get(const struct xattr_handler *handler, struct dentry *unused,
-	 struct inode *inode, const char *name, void *buffer, size_t size)
+	 struct inode *inode, const char *name, void *buffer, size_t size,
+	 int flags)
 {
 	if (!reiserfs_xattrs_user(inode->i_sb))
 		return -EOPNOTSUPP;
fs/squashfs/xattr.c +1 -1
index e1e3f3dd5a06..d8d58c990652 100644
@@ -204,7 +204,7 @@ static int squashfs_xattr_handler_get(const struct xattr_handler *handler,
 				      struct dentry *unused,
 				      struct inode *inode,
 				      const char *name,
-				      void *buffer, size_t size)
+				      void *buffer, size_t size, int flags)
 {
 	return squashfs_xattr_get(inode, handler->flags, name,
 		buffer, size);
fs/ubifs/xattr.c +2 -1
index 9aefbb60074f..26e1a74f178e 100644
@@ -669,7 +669,8 @@ int ubifs_init_security(struct inode *dentry, struct inode *inode,
 
 static int xattr_get(const struct xattr_handler *handler,
 			   struct dentry *dentry, struct inode *inode,
-			   const char *name, void *buffer, size_t size)
+			   const char *name, void *buffer, size_t size,
+			   int flags)
 {
 	dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name,
 		inode->i_ino, dentry, size);
fs/xattr.c +18 -18
index 90dd78f0eb27..71f887518d6f 100644
@@ -281,7 +281,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
 		return PTR_ERR(handler);
 	if (!handler->get)
 		return -EOPNOTSUPP;
-	error = handler->get(handler, dentry, inode, name, NULL, 0);
+	error = handler->get(handler, dentry, inode, name, NULL, 0, 0);
 	if (error < 0)
 		return error;
 
@@ -292,32 +292,20 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
 		memset(value, 0, error + 1);
 	}
 
-	error = handler->get(handler, dentry, inode, name, value, error);
+	error = handler->get(handler, dentry, inode, name, value, error, 0);
 	*xattr_value = value;
 	return error;
 }
 
 ssize_t
 __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
-	       void *value, size_t size)
+	       void *value, size_t size, int flags)
 {
 	const struct xattr_handler *handler;
-
-	handler = xattr_resolve_name(inode, &name);
-	if (IS_ERR(handler))
-		return PTR_ERR(handler);
-	if (!handler->get)
-		return -EOPNOTSUPP;
-	return handler->get(handler, dentry, inode, name, value, size);
-}
-EXPORT_SYMBOL(__vfs_getxattr);
-
-ssize_t
-vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
-{
-	struct inode *inode = dentry->d_inode;
 	int error;
 
+	if (flags & XATTR_NOSECURITY)
+		goto nolsm;
 	error = xattr_permission(inode, name, MAY_READ);
 	if (error)
 		return error;
@@ -339,7 +327,19 @@ vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
 		return ret;
 	}
 nolsm:
-	return __vfs_getxattr(dentry, inode, name, value, size);
+	handler = xattr_resolve_name(inode, &name);
+	if (IS_ERR(handler))
+		return PTR_ERR(handler);
+	if (!handler->get)
+		return -EOPNOTSUPP;
+	return handler->get(handler, dentry, inode, name, value, size, flags);
+}
+EXPORT_SYMBOL(__vfs_getxattr);
+
+ssize_t
+vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
+{
+	return __vfs_getxattr(dentry, dentry->d_inode, name, value, size, 0);
 }
 EXPORT_SYMBOL_GPL(vfs_getxattr);
 
fs/xfs/xfs_xattr.c +2 -1
index 3123b5aaad2a..cafc99c48e20 100644
@@ -18,7 +18,8 @@
 
 static int
 xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused,
-		struct inode *inode, const char *name, void *value, size_t size)
+		struct inode *inode, const char *name, void *value, size_t size,
+		int flags)
 {
 	int xflags = handler->flags;
 	struct xfs_inode *ip = XFS_I(inode);
include/linux/xattr.h +5 -4
index 6dad031be3c2..4df9dcdc48c5 100644
@@ -30,10 +30,10 @@ struct xattr_handler {
 	const char *prefix;
 	int flags;      /* fs private flags */
 	bool (*list)(struct dentry *dentry);
-	int (*get)(const struct xattr_handler *, struct dentry *dentry,
+	int (*get)(const struct xattr_handler *handler, struct dentry *dentry,
 		   struct inode *inode, const char *name, void *buffer,
-		   size_t size);
-	int (*set)(const struct xattr_handler *, struct dentry *dentry,
+		   size_t size, int flags);
+	int (*set)(const struct xattr_handler *handler, struct dentry *dentry,
 		   struct inode *inode, const char *name, const void *buffer,
 		   size_t size, int flags);
 };
@@ -46,7 +46,8 @@ struct xattr {
 	size_t value_len;
 };
 
-ssize_t __vfs_getxattr(struct dentry *, struct inode *, const char *, void *, size_t);
+ssize_t __vfs_getxattr(struct dentry *dentry, struct inode *inode,
+		       const char *name, void *buffer, size_t size, int flags);
 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
 int __vfs_setxattr(struct dentry *, struct inode *, const char *, const void *, size_t, int);
include/uapi/linux/xattr.h +5 -2
index c1395b5bd432..1eba02616274 100644
@@ -17,8 +17,11 @@
 #if __UAPI_DEF_XATTR
 #define __USE_KERNEL_XATTR_DEFS
 
-#define XATTR_CREATE	0x1	/* set value, fail if attr already exists */
-#define XATTR_REPLACE	0x2	/* set value, fail if attr does not exist */
+#define XATTR_CREATE	 0x1	/* set value, fail if attr already exists */
+#define XATTR_REPLACE	 0x2	/* set value, fail if attr does not exist */
+#ifdef __KERNEL__ /* following is kernel internal, colocated for maintenance */
+#define XATTR_NOSECURITY 0x4	/* get value, do not involve security check */
+#endif
 #endif
 
 /* Namespaces */
mm/shmem.c +2 -1
index 2bed4761f279..1013fcbd0a94 100644
@@ -3206,7 +3206,8 @@ static int shmem_initxattrs(struct inode *inode,
 
 static int shmem_xattr_handler_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	struct shmem_inode_info *info = SHMEM_I(inode);
 
net/socket.c +2 -1
index 6a9ab7a8b1d2..6b0fea92dd02 100644
@@ -300,7 +300,8 @@ static const struct dentry_operations sockfs_dentry_operations = {
 
 static int sockfs_xattr_get(const struct xattr_handler *handler,
 			    struct dentry *dentry, struct inode *inode,
-			    const char *suffix, void *value, size_t size)
+			    const char *suffix, void *value, size_t size,
+			    int flags)
 {
 	if (value) {
 		if (dentry->d_name.len + 1 > size)
security/commoncap.c +4 -2
index f4ee0ae106b2..378a2f66a73d 100644
@@ -297,7 +297,8 @@ int cap_inode_need_killpriv(struct dentry *dentry)
 	struct inode *inode = d_backing_inode(dentry);
 	int error;
 
-	error = __vfs_getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0);
+	error = __vfs_getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0,
+			       XATTR_NOSECURITY);
 	return error > 0;
 }
 
@@ -586,7 +587,8 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
 
 	fs_ns = inode->i_sb->s_user_ns;
 	size = __vfs_getxattr((struct dentry *)dentry, inode,
-			      XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ);
+			      XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ,
+			      XATTR_NOSECURITY);
 	if (size == -ENODATA || size == -EOPNOTSUPP)
 		/* no data, that's ok */
 		return -ENODATA;
security/integrity/evm/evm_main.c +2 -1
index f9a81b187fae..921c8f2afcaf 100644
@@ -100,7 +100,8 @@ static int evm_find_protected_xattrs(struct dentry *dentry)
 		return -EOPNOTSUPP;
 
 	list_for_each_entry_rcu(xattr, &evm_config_xattrnames, list) {
-		error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0);
+		error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0,
+				       XATTR_NOSECURITY);
 		if (error < 0) {
 			if (error == -ENODATA)
 				continue;
security/selinux/hooks.c +7 -4
index 74dd46de01b6..b0822da0658f 100644
@@ -552,7 +552,8 @@ static int sb_finish_set_opts(struct super_block *sb)
 			goto out;
 		}
 
-		rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX, NULL, 0);
+		rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX, NULL,
+				    0, XATTR_NOSECURITY);
 		if (rc < 0 && rc != -ENODATA) {
 			if (rc == -EOPNOTSUPP)
 				pr_warn("SELinux: (dev %s, type "
@@ -1378,12 +1379,14 @@ static int inode_doinit_use_xattr(struct inode *inode, struct dentry *dentry,
 		return -ENOMEM;
 
 	context[len] = '\0';
-	rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context, len);
+	rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context, len,
+			    XATTR_NOSECURITY);
 	if (rc == -ERANGE) {
 		kfree(context);
 
 		/* Need a larger buffer.  Query for the right size. */
-		rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, NULL, 0);
+		rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, NULL, 0,
+				    XATTR_NOSECURITY);
 		if (rc < 0)
 			return rc;
 
@@ -1394,7 +1397,7 @@ static int inode_doinit_use_xattr(struct inode *inode, struct dentry *dentry,
 
 		context[len] = '\0';
 		rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX,
-				    context, len);
+				    context, len, XATTR_NOSECURITY);
 	}
 	if (rc < 0) {
 		kfree(context);
security/smack/smack_lsm.c +3 -2
index 4c5e5a438f8b..158b35772be1 100644
@@ -292,7 +292,8 @@ static struct smack_known *smk_fetch(const char *name, struct inode *ip,
 	if (buffer == NULL)
 		return ERR_PTR(-ENOMEM);
 
-	rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL);
+	rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL,
+			    XATTR_NOSECURITY);
 	if (rc < 0)
 		skp = ERR_PTR(rc);
 	else if (rc == 0)
@@ -3442,7 +3443,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
 			} else {
 				rc = __vfs_getxattr(dp, inode,
 					XATTR_NAME_SMACKTRANSMUTE, trattr,
-					TRANS_TRUE_SIZE);
+					TRANS_TRUE_SIZE, XATTR_NOSECURITY);
 				if (rc >= 0 && strncmp(trattr, TRANS_TRUE,
 						       TRANS_TRUE_SIZE) != 0)
 					rc = -EINVAL;
Signature · 6 lines
2.23.0.rc1.153.gdeed80330f-goog


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
#1 lore raw
Thank you for the patch! Yet something to improve:

Hi Mark,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc4 next-20190814]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Mark-Salyzyn/Add-flags-option-to-get-xattr-method-paired-to-__vfs_getxattr/20190816-155049
config: x86_64-lkp (attached as .config)
compiler: gcc-7 (Debian 7.4.0-10) 7.4.0 reproduce:

        # save the attached .config to linux build tree
        make ARCH=x86_64 

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

>> fs/ext2/xattr_security.c:56:9: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]

.get = ext2_xattr_security_get,
^~~~~~~~~~~~~~~~~~~~~~~
fs/ext2/xattr_security.c:56:9: note: (near initialization for 'ext2_xattr_security_handler.get')
cc1: some warnings being treated as errors

vim +56 fs/ext2/xattr_security.c

9d8f13ba3f4833 Mimi Zohar        2011-06-06  53  
749c72efa4bd91 Stephen Hemminger 2010-05-13  54  const struct xattr_handler ext2_xattr_security_handler = {
^1da177e4c3f41 Linus Torvalds    2005-04-16  55  	.prefix	= XATTR_SECURITY_PREFIX,

^1da177e4c3f41 Linus Torvalds 2005-04-16 @56 .get = ext2_xattr_security_get,

:::::: The code at line 56 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds <[email protected]> :::::: CC: Linus Torvalds <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

reviewer Acked-by on v4 1/1
#2 lore raw
In reply to Mark Salyzyn
Quoted 35 lines · Mark Salyzyn

Add a flag option to get xattr method that could have a bit flag of XATTR_NOSECURITY passed to it. XATTR_NOSECURITY is generally then set in the __vfs_getxattr path.

This handles the case of a union filesystem driver that is being requested by the security layer to report back the xattr data.

For the use case where access is to be blocked by the security layer.

The path then could be security(dentry) -> __vfs_getxattr(dentry...XATTR_NOSECUIRTY) -> handler->get(dentry...XATTR_NOSECURITY) -> __vfs_getxattr(lower_dentry...XATTR_NOSECUIRTY) -> lower_handler->get(lower_dentry...XATTR_NOSECUIRTY) which would report back through the chain data and success as expected, the logging security layer at the top would have the data to determine the access permissions and report back the target context that was blocked.

Without the get handler flag, the path on a union filesystem would be the errant security(dentry) -> __vfs_getxattr(dentry) -> handler->get(dentry) -> vfs_getxattr(lower_dentry) -> nested -> security(lower_dentry, log off) -> lower_handler->get(lower_dentry) which would report back through the chain no data, and -EACCES.

For selinux for both cases, this would translate to a correctly determined blocked access. In the first case with this change a correct avc log would be reported, in the second legacy case an incorrect avc log would be reported against an uninitialized u:object_r:unlabeled:s0 context making the logs cosmetically useless for audit2allow.

This patch series is inert and is the wide-spread addition of the flags option for xattr functions, and a replacement of _vfs_getxattr with __vfs_getxattr(...XATTR_NOSECURITY).

Quoted 7 lines

The patch looks good to me. I can see you've missed conversion of one place in ext2 which 0-day spotted so that will need fixing. Otherwise feel free to add:

Honza

Quoted 930 lines

---
v4:
- ifdef __KERNEL__ around XATTR_NOSECURITY to
keep it colocated in uapi headers.

v3:
- poor aim on ubifs not ubifs_xattr_get, but static xattr_get

v2:
- Missed a spot: ubifs, erofs and afs.

v1:
- Removed from an overlayfs patch set, and made independent. Expect this to be the basis of some security improvements.

---
 drivers/staging/erofs/xattr.c     |  3 ++-
 fs/9p/acl.c                       |  3 ++-
 fs/9p/xattr.c                     |  3 ++-
 fs/afs/xattr.c                    |  8 +++----
 fs/btrfs/xattr.c                  |  3 ++-
 fs/ceph/xattr.c                   |  3 ++-
 fs/cifs/xattr.c                   |  2 +-
 fs/ecryptfs/inode.c               |  6 ++++--
 fs/ecryptfs/mmap.c                |  2 +-
 fs/ext2/xattr_trusted.c           |  2 +-
 fs/ext2/xattr_user.c              |  2 +-
 fs/ext4/xattr_security.c          |  2 +-
 fs/ext4/xattr_trusted.c           |  2 +-
 fs/ext4/xattr_user.c              |  2 +-
 fs/f2fs/xattr.c                   |  4 ++--
 fs/fuse/xattr.c                   |  4 ++--
 fs/gfs2/xattr.c                   |  3 ++-
 fs/hfs/attr.c                     |  2 +-
 fs/hfsplus/xattr.c                |  3 ++-
 fs/hfsplus/xattr_trusted.c        |  3 ++-
 fs/hfsplus/xattr_user.c           |  3 ++-
 fs/jffs2/security.c               |  3 ++-
 fs/jffs2/xattr_trusted.c          |  3 ++-
 fs/jffs2/xattr_user.c             |  3 ++-
 fs/jfs/xattr.c                    |  5 +++--
 fs/kernfs/inode.c                 |  3 ++-
 fs/nfs/nfs4proc.c                 |  6 ++++--
 fs/ocfs2/xattr.c                  |  9 +++++---
 fs/orangefs/xattr.c               |  3 ++-
 fs/overlayfs/super.c              |  8 ++++---
 fs/posix_acl.c                    |  2 +-
 fs/reiserfs/xattr_security.c      |  3 ++-
 fs/reiserfs/xattr_trusted.c       |  3 ++-
 fs/reiserfs/xattr_user.c          |  3 ++-
 fs/squashfs/xattr.c               |  2 +-
 fs/ubifs/xattr.c                  |  3 ++-
 fs/xattr.c                        | 36 +++++++++++++++----------------
 fs/xfs/xfs_xattr.c                |  3 ++-
 include/linux/xattr.h             |  9 ++++----
 include/uapi/linux/xattr.h        |  7 ++++--
 mm/shmem.c                        |  3 ++-
 net/socket.c                      |  3 ++-
 security/commoncap.c              |  6 ++++--
 security/integrity/evm/evm_main.c |  3 ++-
 security/selinux/hooks.c          | 11 ++++++----
 security/smack/smack_lsm.c        |  5 +++--
 46 files changed, 126 insertions(+), 84 deletions(-)
drivers/staging/erofs/xattr.c +2 -1
index df40654b9fbb..69440065432c 100644
@@ -463,7 +463,8 @@ int erofs_getxattr(struct inode *inode, int index,
 
 static int erofs_xattr_generic_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
 
fs/9p/acl.c +2 -1
index 6261719f6f2a..cb14e8b312bc 100644
@@ -214,7 +214,8 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep,
 
 static int v9fs_xattr_get_acl(const struct xattr_handler *handler,
 			      struct dentry *dentry, struct inode *inode,
-			      const char *name, void *buffer, size_t size)
+			      const char *name, void *buffer, size_t size,
+			      int flags)
 {
 	struct v9fs_session_info *v9ses;
 	struct posix_acl *acl;
fs/9p/xattr.c +2 -1
index ac8ff8ca4c11..5cfa772452fd 100644
@@ -139,7 +139,8 @@ ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 
 static int v9fs_xattr_handler_get(const struct xattr_handler *handler,
 				  struct dentry *dentry, struct inode *inode,
-				  const char *name, void *buffer, size_t size)
+				  const char *name, void *buffer, size_t size,
+				  int flags)
 {
 	const char *full_name = xattr_full_name(handler, name);
 
fs/afs/xattr.c +4 -4
index 5552d034090a..7e2d97653f5a 100644
@@ -163,7 +163,7 @@ static const struct xattr_handler afs_xattr_afs_acl_handler = {
 static int afs_xattr_get_yfs(const struct xattr_handler *handler,
 			     struct dentry *dentry,
 			     struct inode *inode, const char *name,
-			     void *buffer, size_t size)
+			     void *buffer, size_t size, int flags)
 {
 	struct afs_fs_cursor fc;
 	struct afs_status_cb *scb;
@@ -334,7 +334,7 @@ static const struct xattr_handler afs_xattr_yfs_handler = {
 static int afs_xattr_get_cell(const struct xattr_handler *handler,
 			      struct dentry *dentry,
 			      struct inode *inode, const char *name,
-			      void *buffer, size_t size)
+			      void *buffer, size_t size, int flags)
 {
 	struct afs_vnode *vnode = AFS_FS_I(inode);
 	struct afs_cell *cell = vnode->volume->cell;
@@ -361,7 +361,7 @@ static const struct xattr_handler afs_xattr_afs_cell_handler = {
 static int afs_xattr_get_fid(const struct xattr_handler *handler,
 			     struct dentry *dentry,
 			     struct inode *inode, const char *name,
-			     void *buffer, size_t size)
+			     void *buffer, size_t size, int flags)
 {
 	struct afs_vnode *vnode = AFS_FS_I(inode);
 	char text[16 + 1 + 24 + 1 + 8 + 1];
@@ -397,7 +397,7 @@ static const struct xattr_handler afs_xattr_afs_fid_handler = {
 static int afs_xattr_get_volume(const struct xattr_handler *handler,
 			      struct dentry *dentry,
 			      struct inode *inode, const char *name,
-			      void *buffer, size_t size)
+			      void *buffer, size_t size, int flags)
 {
 	struct afs_vnode *vnode = AFS_FS_I(inode);
 	const char *volname = vnode->volume->name;
fs/btrfs/xattr.c +2 -1
index 95d9aebff2c4..1e522e145344 100644
@@ -353,7 +353,8 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 
 static int btrfs_xattr_handler_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	name = xattr_full_name(handler, name);
 	return btrfs_getxattr(inode, name, buffer, size);
fs/ceph/xattr.c +2 -1
index 37b458a9af3a..edb7eb9ae83e 100644
@@ -1171,7 +1171,8 @@ int __ceph_setxattr(struct inode *inode, const char *name,
 
 static int ceph_get_xattr_handler(const struct xattr_handler *handler,
 				  struct dentry *dentry, struct inode *inode,
-				  const char *name, void *value, size_t size)
+				  const char *name, void *value, size_t size,
+				  int flags)
 {
 	if (!ceph_is_valid_xattr(name))
 		return -EOPNOTSUPP;
fs/cifs/xattr.c +1 -1
index 9076150758d8..7f71c06ce631 100644
@@ -199,7 +199,7 @@ static int cifs_creation_time_get(struct dentry *dentry, struct inode *inode,
 
 static int cifs_xattr_get(const struct xattr_handler *handler,
 			  struct dentry *dentry, struct inode *inode,
-			  const char *name, void *value, size_t size)
+			  const char *name, void *value, size_t size, int flags)
 {
 	ssize_t rc = -EOPNOTSUPP;
 	unsigned int xid;
fs/ecryptfs/inode.c +4 -2
index 18426f4855f1..c710c7533729 100644
@@ -1018,7 +1018,8 @@ ecryptfs_getxattr_lower(struct dentry *lower_dentry, struct inode *lower_inode,
 		goto out;
 	}
 	inode_lock(lower_inode);
-	rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size);
+	rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size,
+			    XATTR_NOSECURITY);
 	inode_unlock(lower_inode);
 out:
 	return rc;
@@ -1103,7 +1104,8 @@ const struct inode_operations ecryptfs_main_iops = {
 
 static int ecryptfs_xattr_get(const struct xattr_handler *handler,
 			      struct dentry *dentry, struct inode *inode,
-			      const char *name, void *buffer, size_t size)
+			      const char *name, void *buffer, size_t size,
+			      int flags)
 {
 	return ecryptfs_getxattr(dentry, inode, name, buffer, size);
 }
fs/ecryptfs/mmap.c +1 -1
index cffa0c1ec829..2362be3e3b4d 100644
@@ -422,7 +422,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode)
 	}
 	inode_lock(lower_inode);
 	size = __vfs_getxattr(lower_dentry, lower_inode, ECRYPTFS_XATTR_NAME,
-			      xattr_virt, PAGE_SIZE);
+			      xattr_virt, PAGE_SIZE, XATTR_NOSECURITY);
 	if (size < 0)
 		size = 8;
 	put_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt);
fs/ext2/xattr_trusted.c +1 -1
index 49add1107850..8d313664f0fa 100644
@@ -18,7 +18,7 @@ ext2_xattr_trusted_list(struct dentry *dentry)
 static int
 ext2_xattr_trusted_get(const struct xattr_handler *handler,
 		       struct dentry *unused, struct inode *inode,
-		       const char *name, void *buffer, size_t size)
+		       const char *name, void *buffer, size_t size, int flags)
 {
 	return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name,
 			      buffer, size);
fs/ext2/xattr_user.c +1 -1
index c243a3b4d69d..712b7c95cc64 100644
@@ -20,7 +20,7 @@ ext2_xattr_user_list(struct dentry *dentry)
 static int
 ext2_xattr_user_get(const struct xattr_handler *handler,
 		    struct dentry *unused, struct inode *inode,
-		    const char *name, void *buffer, size_t size)
+		    const char *name, void *buffer, size_t size, int flags)
 {
 	if (!test_opt(inode->i_sb, XATTR_USER))
 		return -EOPNOTSUPP;
fs/ext4/xattr_security.c +1 -1
index 197a9d8a15ef..50fb71393fb6 100644
@@ -15,7 +15,7 @@
 static int
 ext4_xattr_security_get(const struct xattr_handler *handler,
 			struct dentry *unused, struct inode *inode,
-			const char *name, void *buffer, size_t size)
+			const char *name, void *buffer, size_t size, int flags)
 {
 	return ext4_xattr_get(inode, EXT4_XATTR_INDEX_SECURITY,
 			      name, buffer, size);
fs/ext4/xattr_trusted.c +1 -1
index e9389e5d75c3..64bd8f86c1f1 100644
@@ -22,7 +22,7 @@ ext4_xattr_trusted_list(struct dentry *dentry)
 static int
 ext4_xattr_trusted_get(const struct xattr_handler *handler,
 		       struct dentry *unused, struct inode *inode,
-		       const char *name, void *buffer, size_t size)
+		       const char *name, void *buffer, size_t size, int flags)
 {
 	return ext4_xattr_get(inode, EXT4_XATTR_INDEX_TRUSTED,
 			      name, buffer, size);
fs/ext4/xattr_user.c +1 -1
index d4546184b34b..b7301373820e 100644
@@ -21,7 +21,7 @@ ext4_xattr_user_list(struct dentry *dentry)
 static int
 ext4_xattr_user_get(const struct xattr_handler *handler,
 		    struct dentry *unused, struct inode *inode,
-		    const char *name, void *buffer, size_t size)
+		    const char *name, void *buffer, size_t size, int flags)
 {
 	if (!test_opt(inode->i_sb, XATTR_USER))
 		return -EOPNOTSUPP;
fs/f2fs/xattr.c +2 -2
index b32c45621679..76559da8dfba 100644
@@ -24,7 +24,7 @@
 
 static int f2fs_xattr_generic_get(const struct xattr_handler *handler,
 		struct dentry *unused, struct inode *inode,
-		const char *name, void *buffer, size_t size)
+		const char *name, void *buffer, size_t size, int flags)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
 
@@ -79,7 +79,7 @@ static bool f2fs_xattr_trusted_list(struct dentry *dentry)
 
 static int f2fs_xattr_advise_get(const struct xattr_handler *handler,
 		struct dentry *unused, struct inode *inode,
-		const char *name, void *buffer, size_t size)
+		const char *name, void *buffer, size_t size, int flags)
 {
 	if (buffer)
 		*((char *)buffer) = F2FS_I(inode)->i_advise;
fs/fuse/xattr.c +2 -2
index 433717640f78..d1ef7808304e 100644
@@ -176,7 +176,7 @@ int fuse_removexattr(struct inode *inode, const char *name)
 
 static int fuse_xattr_get(const struct xattr_handler *handler,
 			 struct dentry *dentry, struct inode *inode,
-			 const char *name, void *value, size_t size)
+			 const char *name, void *value, size_t size, int flags)
 {
 	return fuse_getxattr(inode, name, value, size);
 }
@@ -199,7 +199,7 @@ static bool no_xattr_list(struct dentry *dentry)
 
 static int no_xattr_get(const struct xattr_handler *handler,
 			struct dentry *dentry, struct inode *inode,
-			const char *name, void *value, size_t size)
+			const char *name, void *value, size_t size, int flags)
 {
 	return -EOPNOTSUPP;
 }
fs/gfs2/xattr.c +2 -1
index bbe593d16bea..a9db067a99c1 100644
@@ -588,7 +588,8 @@ static int __gfs2_xattr_get(struct inode *inode, const char *name,
 
 static int gfs2_xattr_get(const struct xattr_handler *handler,
 			  struct dentry *unused, struct inode *inode,
-			  const char *name, void *buffer, size_t size)
+			  const char *name, void *buffer, size_t size,
+			  int flags)
 {
 	struct gfs2_inode *ip = GFS2_I(inode);
 	struct gfs2_holder gh;
fs/hfs/attr.c +1 -1
index 74fa62643136..08222a9c5d31 100644
@@ -115,7 +115,7 @@ static ssize_t __hfs_getxattr(struct inode *inode, enum hfs_xattr_type type,
 
 static int hfs_xattr_get(const struct xattr_handler *handler,
 			 struct dentry *unused, struct inode *inode,
-			 const char *name, void *value, size_t size)
+			 const char *name, void *value, size_t size, int flags)
 {
 	return __hfs_getxattr(inode, handler->flags, value, size);
 }
fs/hfsplus/xattr.c +2 -1
index bb0b27d88e50..381c2aaedbc8 100644
@@ -839,7 +839,8 @@ static int hfsplus_removexattr(struct inode *inode, const char *name)
 
 static int hfsplus_osx_getxattr(const struct xattr_handler *handler,
 				struct dentry *unused, struct inode *inode,
-				const char *name, void *buffer, size_t size)
+				const char *name, void *buffer, size_t size,
+				int flags)
 {
 	/*
 	 * Don't allow retrieving properly prefixed attributes
fs/hfsplus/xattr_trusted.c +2 -1
index fbad91e1dada..54d926314f8c 100644
@@ -14,7 +14,8 @@
 
 static int hfsplus_trusted_getxattr(const struct xattr_handler *handler,
 				    struct dentry *unused, struct inode *inode,
-				    const char *name, void *buffer, size_t size)
+				    const char *name, void *buffer,
+				    size_t size, int flags)
 {
 	return hfsplus_getxattr(inode, name, buffer, size,
 				XATTR_TRUSTED_PREFIX,
fs/hfsplus/xattr_user.c +2 -1
index 74d19faf255e..4d2b1ffff887 100644
@@ -14,7 +14,8 @@
 
 static int hfsplus_user_getxattr(const struct xattr_handler *handler,
 				 struct dentry *unused, struct inode *inode,
-				 const char *name, void *buffer, size_t size)
+				 const char *name, void *buffer, size_t size,
+				 int flags)
 {
 
 	return hfsplus_getxattr(inode, name, buffer, size,
fs/jffs2/security.c +2 -1
index c2332e30f218..e6f42fe435af 100644
@@ -50,7 +50,8 @@ int jffs2_init_security(struct inode *inode, struct inode *dir,
 /* ---- XATTR Handler for "security.*" ----------------- */
 static int jffs2_security_getxattr(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_SECURITY,
 				 name, buffer, size);
fs/jffs2/xattr_trusted.c +2 -1
index 5d6030826c52..9dccaae549f5 100644
@@ -18,7 +18,8 @@
 
 static int jffs2_trusted_getxattr(const struct xattr_handler *handler,
 				  struct dentry *unused, struct inode *inode,
-				  const char *name, void *buffer, size_t size)
+				  const char *name, void *buffer, size_t size,
+				  int flags)
 {
 	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED,
 				 name, buffer, size);
fs/jffs2/xattr_user.c +2 -1
index 9d027b4abcf9..c0983a3e810b 100644
@@ -18,7 +18,8 @@
 
 static int jffs2_user_getxattr(const struct xattr_handler *handler,
 			       struct dentry *unused, struct inode *inode,
-			       const char *name, void *buffer, size_t size)
+			       const char *name, void *buffer, size_t size,
+			       int flags)
 {
 	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_USER,
 				 name, buffer, size);
fs/jfs/xattr.c +3 -2
index db41e7803163..5c79a35bf62f 100644
@@ -925,7 +925,7 @@ static int __jfs_xattr_set(struct inode *inode, const char *name,
 
 static int jfs_xattr_get(const struct xattr_handler *handler,
 			 struct dentry *unused, struct inode *inode,
-			 const char *name, void *value, size_t size)
+			 const char *name, void *value, size_t size, int flags)
 {
 	name = xattr_full_name(handler, name);
 	return __jfs_getxattr(inode, name, value, size);
@@ -942,7 +942,8 @@ static int jfs_xattr_set(const struct xattr_handler *handler,
 
 static int jfs_xattr_get_os2(const struct xattr_handler *handler,
 			     struct dentry *unused, struct inode *inode,
-			     const char *name, void *value, size_t size)
+			     const char *name, void *value, size_t size,
+			     int flags)
 {
 	if (is_known_namespace(name))
 		return -EOPNOTSUPP;
fs/kernfs/inode.c +2 -1
index f3f3984cce80..89db24ce644e 100644
@@ -309,7 +309,8 @@ int kernfs_xattr_set(struct kernfs_node *kn, const char *name,
 
 static int kernfs_vfs_xattr_get(const struct xattr_handler *handler,
 				struct dentry *unused, struct inode *inode,
-				const char *suffix, void *value, size_t size)
+				const char *suffix, void *value, size_t size,
+				int flags)
 {
 	const char *name = xattr_full_name(handler, suffix);
 	struct kernfs_node *kn = inode->i_private;
fs/nfs/nfs4proc.c +4 -2
index 1406858bae6c..1905597f86fb 100644
@@ -7218,7 +7218,8 @@ static int nfs4_xattr_set_nfs4_acl(const struct xattr_handler *handler,
 
 static int nfs4_xattr_get_nfs4_acl(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *key, void *buf, size_t buflen)
+				   const char *key, void *buf, size_t buflen,
+				   int flags)
 {
 	return nfs4_proc_get_acl(inode, buf, buflen);
 }
@@ -7243,7 +7244,8 @@ static int nfs4_xattr_set_nfs4_label(const struct xattr_handler *handler,
 
 static int nfs4_xattr_get_nfs4_label(const struct xattr_handler *handler,
 				     struct dentry *unused, struct inode *inode,
-				     const char *key, void *buf, size_t buflen)
+				     const char *key, void *buf, size_t buflen,
+				     int flags)
 {
 	if (security_ismaclabel(key))
 		return nfs4_get_security_label(inode, buf, buflen);
fs/ocfs2/xattr.c +6 -3
index 90c830e3758e..525835807c86 100644
@@ -7242,7 +7242,8 @@ int ocfs2_init_security_and_acl(struct inode *dir,
  */
 static int ocfs2_xattr_security_get(const struct xattr_handler *handler,
 				    struct dentry *unused, struct inode *inode,
-				    const char *name, void *buffer, size_t size)
+				    const char *name, void *buffer, size_t size,
+				    int flags)
 {
 	return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_SECURITY,
 			       name, buffer, size);
@@ -7314,7 +7315,8 @@ const struct xattr_handler ocfs2_xattr_security_handler = {
  */
 static int ocfs2_xattr_trusted_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_TRUSTED,
 			       name, buffer, size);
@@ -7340,7 +7342,8 @@ const struct xattr_handler ocfs2_xattr_trusted_handler = {
  */
 static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
 				struct dentry *unused, struct inode *inode,
-				const char *name, void *buffer, size_t size)
+				const char *name, void *buffer, size_t size,
+				int flags)
 {
 	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
 
fs/orangefs/xattr.c +2 -1
index bdc285aea360..ef4180bff7bb 100644
@@ -541,7 +541,8 @@ static int orangefs_xattr_get_default(const struct xattr_handler *handler,
 				      struct inode *inode,
 				      const char *name,
 				      void *buffer,
-				      size_t size)
+				      size_t size,
+				      int flags)
 {
 	return orangefs_inode_getxattr(inode, name, buffer, size);
 
fs/overlayfs/super.c +5 -3
index b368e2e102fa..a7b21f2ea2dd 100644
@@ -854,7 +854,7 @@ static unsigned int ovl_split_lowerdirs(char *str)
 static int __maybe_unused
 ovl_posix_acl_xattr_get(const struct xattr_handler *handler,
 			struct dentry *dentry, struct inode *inode,
-			const char *name, void *buffer, size_t size)
+			const char *name, void *buffer, size_t size, int flags)
 {
 	return ovl_xattr_get(dentry, inode, handler->name, buffer, size);
 }
@@ -919,7 +919,8 @@ ovl_posix_acl_xattr_set(const struct xattr_handler *handler,
 
 static int ovl_own_xattr_get(const struct xattr_handler *handler,
 			     struct dentry *dentry, struct inode *inode,
-			     const char *name, void *buffer, size_t size)
+			     const char *name, void *buffer, size_t size,
+			     int flags)
 {
 	return -EOPNOTSUPP;
 }
@@ -934,7 +935,8 @@ static int ovl_own_xattr_set(const struct xattr_handler *handler,
 
 static int ovl_other_xattr_get(const struct xattr_handler *handler,
 			       struct dentry *dentry, struct inode *inode,
-			       const char *name, void *buffer, size_t size)
+			       const char *name, void *buffer, size_t size,
+			       int flags)
 {
 	return ovl_xattr_get(dentry, inode, name, buffer, size);
 }
fs/posix_acl.c +1 -1
index 84ad1c90d535..cd55621e570b 100644
@@ -832,7 +832,7 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
 static int
 posix_acl_xattr_get(const struct xattr_handler *handler,
 		    struct dentry *unused, struct inode *inode,
-		    const char *name, void *value, size_t size)
+		    const char *name, void *value, size_t size, int flags)
 {
 	struct posix_acl *acl;
 	int error;
fs/reiserfs/xattr_security.c +2 -1
index 20be9a0e5870..eedfa07a4fd0 100644
@@ -11,7 +11,8 @@
 
 static int
 security_get(const struct xattr_handler *handler, struct dentry *unused,
-	     struct inode *inode, const char *name, void *buffer, size_t size)
+	     struct inode *inode, const char *name, void *buffer, size_t size,
+	     int flags)
 {
 	if (IS_PRIVATE(inode))
 		return -EPERM;
fs/reiserfs/xattr_trusted.c +2 -1
index 5ed48da3d02b..2d11d98605dd 100644
@@ -10,7 +10,8 @@
 
 static int
 trusted_get(const struct xattr_handler *handler, struct dentry *unused,
-	    struct inode *inode, const char *name, void *buffer, size_t size)
+	    struct inode *inode, const char *name, void *buffer, size_t size,
+	    int flags)
 {
 	if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))
 		return -EPERM;
fs/reiserfs/xattr_user.c +2 -1
index a573ca45bacc..2a59d85c69c9 100644
@@ -9,7 +9,8 @@
 
 static int
 user_get(const struct xattr_handler *handler, struct dentry *unused,
-	 struct inode *inode, const char *name, void *buffer, size_t size)
+	 struct inode *inode, const char *name, void *buffer, size_t size,
+	 int flags)
 {
 	if (!reiserfs_xattrs_user(inode->i_sb))
 		return -EOPNOTSUPP;
fs/squashfs/xattr.c +1 -1
index e1e3f3dd5a06..d8d58c990652 100644
@@ -204,7 +204,7 @@ static int squashfs_xattr_handler_get(const struct xattr_handler *handler,
 				      struct dentry *unused,
 				      struct inode *inode,
 				      const char *name,
-				      void *buffer, size_t size)
+				      void *buffer, size_t size, int flags)
 {
 	return squashfs_xattr_get(inode, handler->flags, name,
 		buffer, size);
fs/ubifs/xattr.c +2 -1
index 9aefbb60074f..26e1a74f178e 100644
@@ -669,7 +669,8 @@ int ubifs_init_security(struct inode *dentry, struct inode *inode,
 
 static int xattr_get(const struct xattr_handler *handler,
 			   struct dentry *dentry, struct inode *inode,
-			   const char *name, void *buffer, size_t size)
+			   const char *name, void *buffer, size_t size,
+			   int flags)
 {
 	dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name,
 		inode->i_ino, dentry, size);
fs/xattr.c +18 -18
index 90dd78f0eb27..71f887518d6f 100644
@@ -281,7 +281,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
 		return PTR_ERR(handler);
 	if (!handler->get)
 		return -EOPNOTSUPP;
-	error = handler->get(handler, dentry, inode, name, NULL, 0);
+	error = handler->get(handler, dentry, inode, name, NULL, 0, 0);
 	if (error < 0)
 		return error;
 
@@ -292,32 +292,20 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
 		memset(value, 0, error + 1);
 	}
 
-	error = handler->get(handler, dentry, inode, name, value, error);
+	error = handler->get(handler, dentry, inode, name, value, error, 0);
 	*xattr_value = value;
 	return error;
 }
 
 ssize_t
 __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
-	       void *value, size_t size)
+	       void *value, size_t size, int flags)
 {
 	const struct xattr_handler *handler;
-
-	handler = xattr_resolve_name(inode, &name);
-	if (IS_ERR(handler))
-		return PTR_ERR(handler);
-	if (!handler->get)
-		return -EOPNOTSUPP;
-	return handler->get(handler, dentry, inode, name, value, size);
-}
-EXPORT_SYMBOL(__vfs_getxattr);
-
-ssize_t
-vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
-{
-	struct inode *inode = dentry->d_inode;
 	int error;
 
+	if (flags & XATTR_NOSECURITY)
+		goto nolsm;
 	error = xattr_permission(inode, name, MAY_READ);
 	if (error)
 		return error;
@@ -339,7 +327,19 @@ vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
 		return ret;
 	}
 nolsm:
-	return __vfs_getxattr(dentry, inode, name, value, size);
+	handler = xattr_resolve_name(inode, &name);
+	if (IS_ERR(handler))
+		return PTR_ERR(handler);
+	if (!handler->get)
+		return -EOPNOTSUPP;
+	return handler->get(handler, dentry, inode, name, value, size, flags);
+}
+EXPORT_SYMBOL(__vfs_getxattr);
+
+ssize_t
+vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
+{
+	return __vfs_getxattr(dentry, dentry->d_inode, name, value, size, 0);
 }
 EXPORT_SYMBOL_GPL(vfs_getxattr);
 
fs/xfs/xfs_xattr.c +2 -1
index 3123b5aaad2a..cafc99c48e20 100644
@@ -18,7 +18,8 @@
 
 static int
 xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused,
-		struct inode *inode, const char *name, void *value, size_t size)
+		struct inode *inode, const char *name, void *value, size_t size,
+		int flags)
 {
 	int xflags = handler->flags;
 	struct xfs_inode *ip = XFS_I(inode);
include/linux/xattr.h +5 -4
index 6dad031be3c2..4df9dcdc48c5 100644
@@ -30,10 +30,10 @@ struct xattr_handler {
 	const char *prefix;
 	int flags;      /* fs private flags */
 	bool (*list)(struct dentry *dentry);
-	int (*get)(const struct xattr_handler *, struct dentry *dentry,
+	int (*get)(const struct xattr_handler *handler, struct dentry *dentry,
 		   struct inode *inode, const char *name, void *buffer,
-		   size_t size);
-	int (*set)(const struct xattr_handler *, struct dentry *dentry,
+		   size_t size, int flags);
+	int (*set)(const struct xattr_handler *handler, struct dentry *dentry,
 		   struct inode *inode, const char *name, const void *buffer,
 		   size_t size, int flags);
 };
@@ -46,7 +46,8 @@ struct xattr {
 	size_t value_len;
 };
 
-ssize_t __vfs_getxattr(struct dentry *, struct inode *, const char *, void *, size_t);
+ssize_t __vfs_getxattr(struct dentry *dentry, struct inode *inode,
+		       const char *name, void *buffer, size_t size, int flags);
 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
 int __vfs_setxattr(struct dentry *, struct inode *, const char *, const void *, size_t, int);
include/uapi/linux/xattr.h +5 -2
index c1395b5bd432..1eba02616274 100644
@@ -17,8 +17,11 @@
 #if __UAPI_DEF_XATTR
 #define __USE_KERNEL_XATTR_DEFS
 
-#define XATTR_CREATE	0x1	/* set value, fail if attr already exists */
-#define XATTR_REPLACE	0x2	/* set value, fail if attr does not exist */
+#define XATTR_CREATE	 0x1	/* set value, fail if attr already exists */
+#define XATTR_REPLACE	 0x2	/* set value, fail if attr does not exist */
+#ifdef __KERNEL__ /* following is kernel internal, colocated for maintenance */
+#define XATTR_NOSECURITY 0x4	/* get value, do not involve security check */
+#endif
 #endif
 
 /* Namespaces */
mm/shmem.c +2 -1
index 2bed4761f279..1013fcbd0a94 100644
@@ -3206,7 +3206,8 @@ static int shmem_initxattrs(struct inode *inode,
 
 static int shmem_xattr_handler_get(const struct xattr_handler *handler,
 				   struct dentry *unused, struct inode *inode,
-				   const char *name, void *buffer, size_t size)
+				   const char *name, void *buffer, size_t size,
+				   int flags)
 {
 	struct shmem_inode_info *info = SHMEM_I(inode);
 
net/socket.c +2 -1
index 6a9ab7a8b1d2..6b0fea92dd02 100644
@@ -300,7 +300,8 @@ static const struct dentry_operations sockfs_dentry_operations = {
 
 static int sockfs_xattr_get(const struct xattr_handler *handler,
 			    struct dentry *dentry, struct inode *inode,
-			    const char *suffix, void *value, size_t size)
+			    const char *suffix, void *value, size_t size,
+			    int flags)
 {
 	if (value) {
 		if (dentry->d_name.len + 1 > size)
security/commoncap.c +4 -2
index f4ee0ae106b2..378a2f66a73d 100644
@@ -297,7 +297,8 @@ int cap_inode_need_killpriv(struct dentry *dentry)
 	struct inode *inode = d_backing_inode(dentry);
 	int error;
 
-	error = __vfs_getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0);
+	error = __vfs_getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0,
+			       XATTR_NOSECURITY);
 	return error > 0;
 }
 
@@ -586,7 +587,8 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
 
 	fs_ns = inode->i_sb->s_user_ns;
 	size = __vfs_getxattr((struct dentry *)dentry, inode,
-			      XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ);
+			      XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ,
+			      XATTR_NOSECURITY);
 	if (size == -ENODATA || size == -EOPNOTSUPP)
 		/* no data, that's ok */
 		return -ENODATA;
security/integrity/evm/evm_main.c +2 -1
index f9a81b187fae..921c8f2afcaf 100644
@@ -100,7 +100,8 @@ static int evm_find_protected_xattrs(struct dentry *dentry)
 		return -EOPNOTSUPP;
 
 	list_for_each_entry_rcu(xattr, &evm_config_xattrnames, list) {
-		error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0);
+		error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0,
+				       XATTR_NOSECURITY);
 		if (error < 0) {
 			if (error == -ENODATA)
 				continue;
security/selinux/hooks.c +7 -4
index 74dd46de01b6..b0822da0658f 100644
@@ -552,7 +552,8 @@ static int sb_finish_set_opts(struct super_block *sb)
 			goto out;
 		}
 
-		rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX, NULL, 0);
+		rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX, NULL,
+				    0, XATTR_NOSECURITY);
 		if (rc < 0 && rc != -ENODATA) {
 			if (rc == -EOPNOTSUPP)
 				pr_warn("SELinux: (dev %s, type "
@@ -1378,12 +1379,14 @@ static int inode_doinit_use_xattr(struct inode *inode, struct dentry *dentry,
 		return -ENOMEM;
 
 	context[len] = '\0';
-	rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context, len);
+	rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context, len,
+			    XATTR_NOSECURITY);
 	if (rc == -ERANGE) {
 		kfree(context);
 
 		/* Need a larger buffer.  Query for the right size. */
-		rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, NULL, 0);
+		rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, NULL, 0,
+				    XATTR_NOSECURITY);
 		if (rc < 0)
 			return rc;
 
@@ -1394,7 +1397,7 @@ static int inode_doinit_use_xattr(struct inode *inode, struct dentry *dentry,
 
 		context[len] = '\0';
 		rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX,
-				    context, len);
+				    context, len, XATTR_NOSECURITY);
 	}
 	if (rc < 0) {
 		kfree(context);
security/smack/smack_lsm.c +3 -2
index 4c5e5a438f8b..158b35772be1 100644
@@ -292,7 +292,8 @@ static struct smack_known *smk_fetch(const char *name, struct inode *ip,
 	if (buffer == NULL)
 		return ERR_PTR(-ENOMEM);
 
-	rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL);
+	rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL,
+			    XATTR_NOSECURITY);
 	if (rc < 0)
 		skp = ERR_PTR(rc);
 	else if (rc == 0)
@@ -3442,7 +3443,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
 			} else {
 				rc = __vfs_getxattr(dp, inode,
 					XATTR_NAME_SMACKTRANSMUTE, trattr,
-					TRANS_TRUE_SIZE);
+					TRANS_TRUE_SIZE, XATTR_NOSECURITY);
 				if (rc >= 0 && strncmp(trattr, TRANS_TRUE,
 						       TRANS_TRUE_SIZE) != 0)
 					rc = -EINVAL;
Signature · 1 line
2.23.0.rc1.153.gdeed80330f-goog
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR
#3 lore raw

I will redo the manual audit, perhaps I need to not be so scared of allconfig build ;-} (currently my runtime & buildtime test platform is android 4.19 kernel, my bad).

I am going through and exploring/changing/testing everything to deal with GregKH/jmorris wanting a single xattr_gs_args structure reference where the flags argument is stowed, rather than YA adding a flags argument. It is doubling the (mechanical) codebase impact but decreases the future maintenance and _large_ set of stakeholders (+75 at last count).

-- Mark

Quoted 1,120 lines · Jan Kara
Quoted 19 lines · Mark Salyzyn

Add a flag option to get xattr method that could have a bit flag of XATTR_NOSECURITY passed to it. XATTR_NOSECURITY is generally then set in the __vfs_getxattr path.

This handles the case of a union filesystem driver that is being requested by the security layer to report back the xattr data.

For the use case where access is to be blocked by the security layer.

The path then could be security(dentry) -> __vfs_getxattr(dentry...XATTR_NOSECUIRTY) -> handler->get(dentry...XATTR_NOSECURITY) -> __vfs_getxattr(lower_dentry...XATTR_NOSECUIRTY) -> lower_handler->get(lower_dentry...XATTR_NOSECUIRTY) which would report back through the chain data and success as expected, the logging security layer at the top would have the data to determine the access permissions and report back the target context that was blocked.

Quoted 8 lines

Without the get handler flag, the path on a union filesystem would be the errant security(dentry) -> __vfs_getxattr(dentry) -> handler->get(dentry) -> vfs_getxattr(lower_dentry) -> nested -> security(lower_dentry, log off) -> lower_handler->get(lower_dentry) which would report back through the chain no data, and -EACCES.

For selinux for both cases, this would translate to a correctly determined blocked access. In the first case with this change a correct

avc

Quoted 8 lines

log would be reported, in the second legacy case an incorrect avc log would be reported against an uninitialized u:object_r:unlabeled:s0 context making the logs cosmetically useless for audit2allow.

This patch series is inert and is the wide-spread addition of the flags option for xattr functions, and a replacement of _vfs_getxattr with __vfs_getxattr(...XATTR_NOSECURITY).

Quoted 7 lines

The patch looks good to me. I can see you've missed conversion of one place in ext2 which 0-day spotted so that will need fixing. Otherwise feel free to add:

Honza

Quoted 63 lines

---
v4:
- ifdef __KERNEL__ around XATTR_NOSECURITY to
keep it colocated in uapi headers.

v3:
- poor aim on ubifs not ubifs_xattr_get, but static xattr_get

v2:
- Missed a spot: ubifs, erofs and afs.

v1:
- Removed from an overlayfs patch set, and made independent. Expect this to be the basis of some security improvements.

---
 drivers/staging/erofs/xattr.c     |  3 ++-
 fs/9p/acl.c                       |  3 ++-
 fs/9p/xattr.c                     |  3 ++-
 fs/afs/xattr.c                    |  8 +++----
 fs/btrfs/xattr.c                  |  3 ++-
 fs/ceph/xattr.c                   |  3 ++-
 fs/cifs/xattr.c                   |  2 +-
 fs/ecryptfs/inode.c               |  6 ++++--
 fs/ecryptfs/mmap.c                |  2 +-
 fs/ext2/xattr_trusted.c           |  2 +-
 fs/ext2/xattr_user.c              |  2 +-
 fs/ext4/xattr_security.c          |  2 +-
 fs/ext4/xattr_trusted.c           |  2 +-
 fs/ext4/xattr_user.c              |  2 +-
 fs/f2fs/xattr.c                   |  4 ++--
 fs/fuse/xattr.c                   |  4 ++--
 fs/gfs2/xattr.c                   |  3 ++-
 fs/hfs/attr.c                     |  2 +-
 fs/hfsplus/xattr.c                |  3 ++-
 fs/hfsplus/xattr_trusted.c        |  3 ++-
 fs/hfsplus/xattr_user.c           |  3 ++-
 fs/jffs2/security.c               |  3 ++-
 fs/jffs2/xattr_trusted.c          |  3 ++-
 fs/jffs2/xattr_user.c             |  3 ++-
 fs/jfs/xattr.c                    |  5 +++--
 fs/kernfs/inode.c                 |  3 ++-
 fs/nfs/nfs4proc.c                 |  6 ++++--
 fs/ocfs2/xattr.c                  |  9 +++++---
 fs/orangefs/xattr.c               |  3 ++-
 fs/overlayfs/super.c              |  8 ++++---
 fs/posix_acl.c                    |  2 +-
 fs/reiserfs/xattr_security.c      |  3 ++-
 fs/reiserfs/xattr_trusted.c       |  3 ++-
 fs/reiserfs/xattr_user.c          |  3 ++-
 fs/squashfs/xattr.c               |  2 +-
 fs/ubifs/xattr.c                  |  3 ++-
 fs/xattr.c                        | 36 +++++++++++++++----------------
 fs/xfs/xfs_xattr.c                |  3 ++-
 include/linux/xattr.h             |  9 ++++----
 include/uapi/linux/xattr.h        |  7 ++++--
 mm/shmem.c                        |  3 ++-
 net/socket.c                      |  3 ++-
 security/commoncap.c              |  6 ++++--
 security/integrity/evm/evm_main.c |  3 ++-
 security/selinux/hooks.c          | 11 ++++++----
 security/smack/smack_lsm.c        |  5 +++--
 46 files changed, 126 insertions(+), 84 deletions(-)

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/staging/erofs/xattr.c

drivers/staging/erofs/xattr.c int erofs_getxattr(struct inode *inode, int index, · line 465

Quoted 7 lines

index df40654b9fbb..69440065432c 100644

drivers/staging/erofs/xattr.c +0 -0
@@ -463,7 +463,8 @@ int erofs_getxattr(struct inode *inode, int index,
 
 static int erofs_xattr_generic_get(const struct xattr_handler *handler,
                                 struct dentry *unused, struct inode

*inode,

drivers/staging/erofs/xattr.c int erofs_getxattr(struct inode *inode, int index, · line 466

Quoted 1 line
drivers/staging/erofs/xattr.c +0 -1
-                                const char *name, void *buffer, size_t

size)

drivers/staging/erofs/xattr.c int erofs_getxattr(struct inode *inode, int index, · line 466

Quoted 1 line
drivers/staging/erofs/xattr.c +1 -0
+                                const char *name, void *buffer, size_t

size,

fs/9p/xattr.c ssize_t v9fs_listxattr(struct dentry *dentry, char

Quoted 23 lines
drivers/staging/erofs/xattr.c +1 -0
+                                int flags)
 {
      struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
 
fs/9p/acl.c +2 -1
index 6261719f6f2a..cb14e8b312bc 100644
@@ -214,7 +214,8 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep,
 
 static int v9fs_xattr_get_acl(const struct xattr_handler *handler,
                            struct dentry *dentry, struct inode *inode,
-                           const char *name, void *buffer, size_t size)
+                           const char *name, void *buffer, size_t size,
+                           int flags)
 {
      struct v9fs_session_info *v9ses;
      struct posix_acl *acl;
fs/9p/xattr.c +0 -0
index ac8ff8ca4c11..5cfa772452fd 100644
@@ -139,7 +139,8 @@ ssize_t v9fs_listxattr(struct dentry *dentry, char

*buffer, size_t buffer_size)

fs/9p/xattr.c ssize_t v9fs_listxattr(struct dentry *dentry, char · line 140

Quoted 3 lines
fs/9p/xattr.c +0 -0
 static int v9fs_xattr_handler_get(const struct xattr_handler *handler,
                                struct dentry *dentry, struct inode

*inode,

fs/9p/xattr.c ssize_t v9fs_listxattr(struct dentry *dentry, char · line 141

Quoted 1 line
fs/9p/xattr.c +0 -1
-                               const char *name, void *buffer, size_t

size)

fs/9p/xattr.c ssize_t v9fs_listxattr(struct dentry *dentry, char · line 141

Quoted 1 line
fs/9p/xattr.c +1 -0
+                               const char *name, void *buffer, size_t

size,

fs/afs/xattr.c static const struct xattr_handler

Quoted 9 lines
fs/9p/xattr.c +1 -0
+                               int flags)
 {
      const char *full_name = xattr_full_name(handler, name);
 
fs/afs/xattr.c +0 -0
index 5552d034090a..7e2d97653f5a 100644
@@ -163,7 +163,7 @@ static const struct xattr_handler

afs_xattr_afs_acl_handler = {

fs/afs/xattr.c static const struct xattr_handler

Quoted 9 lines
fs/afs/xattr.c +1 -1
 static int afs_xattr_get_yfs(const struct xattr_handler *handler,
                           struct dentry *dentry,
                           struct inode *inode, const char *name,
-                          void *buffer, size_t size)
+                          void *buffer, size_t size, int flags)
 {
      struct afs_fs_cursor fc;
      struct afs_status_cb *scb;
@@ -334,7 +334,7 @@ static const struct xattr_handler

afs_xattr_yfs_handler = {

fs/afs/xattr.c static const struct xattr_handler

Quoted 9 lines
fs/afs/xattr.c +1 -1
 static int afs_xattr_get_cell(const struct xattr_handler *handler,
                            struct dentry *dentry,
                            struct inode *inode, const char *name,
-                           void *buffer, size_t size)
+                           void *buffer, size_t size, int flags)
 {
      struct afs_vnode *vnode = AFS_FS_I(inode);
      struct afs_cell *cell = vnode->volume->cell;
@@ -361,7 +361,7 @@ static const struct xattr_handler

afs_xattr_afs_cell_handler = {

fs/afs/xattr.c static const struct xattr_handler

Quoted 9 lines
fs/afs/xattr.c +1 -1
 static int afs_xattr_get_fid(const struct xattr_handler *handler,
                           struct dentry *dentry,
                           struct inode *inode, const char *name,
-                          void *buffer, size_t size)
+                          void *buffer, size_t size, int flags)
 {
      struct afs_vnode *vnode = AFS_FS_I(inode);
      char text[16 + 1 + 24 + 1 + 8 + 1];
@@ -397,7 +397,7 @@ static const struct xattr_handler

afs_xattr_afs_fid_handler = {

fs/btrfs/xattr.c ssize_t btrfs_listxattr(struct dentry *dentry, char

Quoted 13 lines
fs/afs/xattr.c +1 -1
 static int afs_xattr_get_volume(const struct xattr_handler *handler,
                            struct dentry *dentry,
                            struct inode *inode, const char *name,
-                           void *buffer, size_t size)
+                           void *buffer, size_t size, int flags)
 {
      struct afs_vnode *vnode = AFS_FS_I(inode);
      const char *volname = vnode->volume->name;
fs/btrfs/xattr.c +0 -0
index 95d9aebff2c4..1e522e145344 100644
@@ -353,7 +353,8 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char

*buffer, size_t size)

fs/btrfs/xattr.c ssize_t btrfs_listxattr(struct dentry *dentry, char · line 354

Quoted 3 lines
fs/btrfs/xattr.c +0 -0
 static int btrfs_xattr_handler_get(const struct xattr_handler *handler,
                                 struct dentry *unused, struct inode

*inode,

fs/btrfs/xattr.c ssize_t btrfs_listxattr(struct dentry *dentry, char · line 355

Quoted 1 line
fs/btrfs/xattr.c +0 -1
-                                const char *name, void *buffer, size_t

size)

fs/btrfs/xattr.c ssize_t btrfs_listxattr(struct dentry *dentry, char · line 355

Quoted 1 line
fs/btrfs/xattr.c +1 -0
+                                const char *name, void *buffer, size_t

size,

fs/ceph/xattr.c int __ceph_setxattr(struct inode *inode, const

Quoted 9 lines
fs/btrfs/xattr.c +1 -0
+                                int flags)
 {
      name = xattr_full_name(handler, name);
      return btrfs_getxattr(inode, name, buffer, size);
fs/ceph/xattr.c +0 -0
index 37b458a9af3a..edb7eb9ae83e 100644
@@ -1171,7 +1171,8 @@ int __ceph_setxattr(struct inode *inode, const

char *name,

fs/ceph/xattr.c int __ceph_setxattr(struct inode *inode, const · line 1172

Quoted 3 lines
fs/ceph/xattr.c +0 -0
 static int ceph_get_xattr_handler(const struct xattr_handler *handler,
                                struct dentry *dentry, struct inode

*inode,

fs/ceph/xattr.c int __ceph_setxattr(struct inode *inode, const · line 1173

Quoted 1 line
fs/ceph/xattr.c +0 -1
-                               const char *name, void *value, size_t

size)

fs/ceph/xattr.c int __ceph_setxattr(struct inode *inode, const · line 1173

Quoted 1 line
fs/ceph/xattr.c +1 -0
+                               const char *name, void *value, size_t

size,

fs/cifs/xattr.c static int cifs_creation_time_get(struct dentry

Quoted 9 lines
fs/ceph/xattr.c +1 -0
+                               int flags)
 {
      if (!ceph_is_valid_xattr(name))
              return -EOPNOTSUPP;
fs/cifs/xattr.c +0 -0
index 9076150758d8..7f71c06ce631 100644
@@ -199,7 +199,7 @@ static int cifs_creation_time_get(struct dentry

*dentry, struct inode *inode,

fs/cifs/xattr.c static int cifs_creation_time_get(struct dentry *dentry, struct inode *inode,

Quoted 5 lines
fs/cifs/xattr.c +1 -1
 static int cifs_xattr_get(const struct xattr_handler *handler,
                        struct dentry *dentry, struct inode *inode,
-                       const char *name, void *value, size_t size)
+                       const char *name, void *value, size_t size, int

flags)

fs/ecryptfs/inode.c ecryptfs_getxattr_lower(struct dentry

Quoted 8 lines
fs/cifs/xattr.c +0 -0
 {
      ssize_t rc = -EOPNOTSUPP;
      unsigned int xid;
fs/ecryptfs/inode.c +0 -0
index 18426f4855f1..c710c7533729 100644
@@ -1018,7 +1018,8 @@ ecryptfs_getxattr_lower(struct dentry

*lower_dentry, struct inode *lower_inode,

fs/ecryptfs/inode.c const struct inode_operations ecryptfs_main_iops =

Quoted 10 lines
fs/ecryptfs/inode.c +2 -1
              goto out;
      }
      inode_lock(lower_inode);
-     rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size);
+     rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size,
+                         XATTR_NOSECURITY);
      inode_unlock(lower_inode);
 out:
      return rc;
@@ -1103,7 +1104,8 @@ const struct inode_operations ecryptfs_main_iops =

{

fs/ecryptfs/mmap.c static int ecryptfs_write_inode_size_to_xattr(struct

Quoted 14 lines
fs/ecryptfs/inode.c +2 -1
 static int ecryptfs_xattr_get(const struct xattr_handler *handler,
                            struct dentry *dentry, struct inode *inode,
-                           const char *name, void *buffer, size_t size)
+                           const char *name, void *buffer, size_t size,
+                           int flags)
 {
      return ecryptfs_getxattr(dentry, inode, name, buffer, size);
 }
fs/ecryptfs/mmap.c +0 -0
index cffa0c1ec829..2362be3e3b4d 100644
@@ -422,7 +422,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct

inode *ecryptfs_inode)

fs/ecryptfs/mmap.c static int ecryptfs_write_inode_size_to_xattr(struct · line 424

Quoted 3 lines
fs/ecryptfs/mmap.c +0 -0
      }
      inode_lock(lower_inode);
      size = __vfs_getxattr(lower_dentry, lower_inode,

ECRYPTFS_XATTR_NAME,

Quoted 10 lines
fs/ecryptfs/mmap.c +1 -1
-                           xattr_virt, PAGE_SIZE);
+                           xattr_virt, PAGE_SIZE, XATTR_NOSECURITY);
      if (size < 0)
              size = 8;
      put_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt);
fs/ext2/xattr_trusted.c +0 -0
index 49add1107850..8d313664f0fa 100644

fs/ext2/xattr_trusted.c ext2_xattr_trusted_list(struct dentry *dentry) · line 21

Quoted 5 lines
fs/ext2/xattr_trusted.c +1 -1
@@ -18,7 +18,7 @@ ext2_xattr_trusted_list(struct dentry *dentry)
 static int
 ext2_xattr_trusted_get(const struct xattr_handler *handler,
                     struct dentry *unused, struct inode *inode,
-                    const char *name, void *buffer, size_t size)
+                    const char *name, void *buffer, size_t size, int

flags)

Quoted 21 lines
fs/ext2/xattr_trusted.c +0 -0
 {
      return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name,
                            buffer, size);
fs/ext2/xattr_user.c +1 -1
index c243a3b4d69d..712b7c95cc64 100644
@@ -20,7 +20,7 @@ ext2_xattr_user_list(struct dentry *dentry)
 static int
 ext2_xattr_user_get(const struct xattr_handler *handler,
                  struct dentry *unused, struct inode *inode,
-                 const char *name, void *buffer, size_t size)
+                 const char *name, void *buffer, size_t size, int flags)
 {
      if (!test_opt(inode->i_sb, XATTR_USER))
              return -EOPNOTSUPP;
fs/ext4/xattr_security.c +0 -0
index 197a9d8a15ef..50fb71393fb6 100644

fs/ext4/xattr_security.c line 18

Quoted 5 lines
fs/ext4/xattr_security.c +1 -1
@@ -15,7 +15,7 @@
 static int
 ext4_xattr_security_get(const struct xattr_handler *handler,
                      struct dentry *unused, struct inode *inode,
-                     const char *name, void *buffer, size_t size)
+                     const char *name, void *buffer, size_t size, int

flags)

fs/ext4/xattr_trusted.c ext4_xattr_trusted_list(struct dentry *dentry) · line 25

Quoted 13 lines
fs/ext4/xattr_security.c +0 -0
 {
      return ext4_xattr_get(inode, EXT4_XATTR_INDEX_SECURITY,
                            name, buffer, size);
fs/ext4/xattr_trusted.c +1 -1
index e9389e5d75c3..64bd8f86c1f1 100644
@@ -22,7 +22,7 @@ ext4_xattr_trusted_list(struct dentry *dentry)
 static int
 ext4_xattr_trusted_get(const struct xattr_handler *handler,
                     struct dentry *unused, struct inode *inode,
-                    const char *name, void *buffer, size_t size)
+                    const char *name, void *buffer, size_t size, int

flags)

fs/f2fs/xattr.c static bool f2fs_xattr_trusted_list(struct dentry

Quoted 30 lines
fs/ext4/xattr_trusted.c +0 -0
 {
      return ext4_xattr_get(inode, EXT4_XATTR_INDEX_TRUSTED,
                            name, buffer, size);
fs/ext4/xattr_user.c +1 -1
index d4546184b34b..b7301373820e 100644
@@ -21,7 +21,7 @@ ext4_xattr_user_list(struct dentry *dentry)
 static int
 ext4_xattr_user_get(const struct xattr_handler *handler,
                  struct dentry *unused, struct inode *inode,
-                 const char *name, void *buffer, size_t size)
+                 const char *name, void *buffer, size_t size, int flags)
 {
      if (!test_opt(inode->i_sb, XATTR_USER))
              return -EOPNOTSUPP;
fs/f2fs/xattr.c +1 -1
index b32c45621679..76559da8dfba 100644
@@ -24,7 +24,7 @@
 
 static int f2fs_xattr_generic_get(const struct xattr_handler *handler,
              struct dentry *unused, struct inode *inode,
-             const char *name, void *buffer, size_t size)
+             const char *name, void *buffer, size_t size, int flags)
 {
      struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
 
@@ -79,7 +79,7 @@ static bool f2fs_xattr_trusted_list(struct dentry

*dentry)

fs/fuse/xattr.c int fuse_removexattr(struct inode *inode, const char

Quoted 13 lines
fs/f2fs/xattr.c +1 -1
 static int f2fs_xattr_advise_get(const struct xattr_handler *handler,
              struct dentry *unused, struct inode *inode,
-             const char *name, void *buffer, size_t size)
+             const char *name, void *buffer, size_t size, int flags)
 {
      if (buffer)
              *((char *)buffer) = F2FS_I(inode)->i_advise;
fs/fuse/xattr.c +0 -0
index 433717640f78..d1ef7808304e 100644
@@ -176,7 +176,7 @@ int fuse_removexattr(struct inode *inode, const char

*name)

fs/fuse/xattr.c int fuse_removexattr(struct inode *inode, const char *name)

Quoted 5 lines
fs/fuse/xattr.c +1 -1
 static int fuse_xattr_get(const struct xattr_handler *handler,
                       struct dentry *dentry, struct inode *inode,
-                      const char *name, void *value, size_t size)
+                      const char *name, void *value, size_t size, int

flags)

fs/fuse/xattr.c static bool no_xattr_list(struct dentry *dentry) · line 202

Quoted 9 lines
fs/fuse/xattr.c +1 -1
 {
      return fuse_getxattr(inode, name, value, size);
 }
@@ -199,7 +199,7 @@ static bool no_xattr_list(struct dentry *dentry)
 
 static int no_xattr_get(const struct xattr_handler *handler,
                      struct dentry *dentry, struct inode *inode,
-                     const char *name, void *value, size_t size)
+                     const char *name, void *value, size_t size, int

flags)

fs/gfs2/xattr.c static int __gfs2_xattr_get(struct inode *inode,

Quoted 8 lines
fs/fuse/xattr.c +0 -0
 {
      return -EOPNOTSUPP;
 }
fs/gfs2/xattr.c +0 -0
index bbe593d16bea..a9db067a99c1 100644
@@ -588,7 +588,8 @@ static int __gfs2_xattr_get(struct inode *inode,

const char *name,

fs/hfs/attr.c static ssize_t __hfs_getxattr(struct inode *inode,

Quoted 14 lines
fs/gfs2/xattr.c +2 -1
 static int gfs2_xattr_get(const struct xattr_handler *handler,
                        struct dentry *unused, struct inode *inode,
-                       const char *name, void *buffer, size_t size)
+                       const char *name, void *buffer, size_t size,
+                       int flags)
 {
      struct gfs2_inode *ip = GFS2_I(inode);
      struct gfs2_holder gh;
fs/hfs/attr.c +0 -0
index 74fa62643136..08222a9c5d31 100644
@@ -115,7 +115,7 @@ static ssize_t __hfs_getxattr(struct inode *inode,

enum hfs_xattr_type type,

fs/hfs/attr.c static ssize_t __hfs_getxattr(struct inode *inode, enum hfs_xattr_type type,

Quoted 5 lines
fs/hfs/attr.c +1 -1
 static int hfs_xattr_get(const struct xattr_handler *handler,
                       struct dentry *unused, struct inode *inode,
-                      const char *name, void *value, size_t size)
+                      const char *name, void *value, size_t size, int

flags)

fs/hfsplus/xattr.c static int hfsplus_removexattr(struct inode *inode,

Quoted 8 lines
fs/hfs/attr.c +0 -0
 {
      return __hfs_getxattr(inode, handler->flags, value, size);
 }
fs/hfsplus/xattr.c +0 -0
index bb0b27d88e50..381c2aaedbc8 100644
@@ -839,7 +839,8 @@ static int hfsplus_removexattr(struct inode *inode,

const char *name)

fs/hfsplus/xattr.c static int hfsplus_removexattr(struct inode *inode, const char *name)

Quoted 4 lines
fs/hfsplus/xattr.c +0 -1
 static int hfsplus_osx_getxattr(const struct xattr_handler *handler,
                              struct dentry *unused, struct inode *inode,
-                             const char *name, void *buffer, size_t

size)

fs/hfsplus/xattr.c static int hfsplus_removexattr(struct inode *inode, · line 841

Quoted 1 line
fs/hfsplus/xattr.c +1 -0
+                             const char *name, void *buffer, size_t

size,

fs/hfsplus/xattr_trusted.c line 16

Quoted 12 lines
fs/hfsplus/xattr.c +1 -0
+                             int flags)
 {
      /*
       * Don't allow retrieving properly prefixed attributes
fs/hfsplus/xattr_trusted.c +0 -0
index fbad91e1dada..54d926314f8c 100644
@@ -14,7 +14,8 @@
 
 static int hfsplus_trusted_getxattr(const struct xattr_handler *handler,
                                  struct dentry *unused, struct inode

*inode,

fs/hfsplus/xattr_trusted.c line 17

Quoted 1 line
fs/hfsplus/xattr_trusted.c +0 -1
-                                 const char *name, void *buffer, size_t

size)

fs/hfsplus/xattr_user.c line 16

Quoted 13 lines
fs/hfsplus/xattr_trusted.c +2 -0
+                                 const char *name, void *buffer,
+                                 size_t size, int flags)
 {
      return hfsplus_getxattr(inode, name, buffer, size,
                              XATTR_TRUSTED_PREFIX,
fs/hfsplus/xattr_user.c +0 -0
index 74d19faf255e..4d2b1ffff887 100644
@@ -14,7 +14,8 @@
 
 static int hfsplus_user_getxattr(const struct xattr_handler *handler,
                               struct dentry *unused, struct inode

*inode,

fs/hfsplus/xattr_user.c line 17

Quoted 1 line
fs/hfsplus/xattr_user.c +0 -1
-                              const char *name, void *buffer, size_t

size)

fs/hfsplus/xattr_user.c line 17

Quoted 1 line
fs/hfsplus/xattr_user.c +1 -0
+                              const char *name, void *buffer, size_t

size,

fs/jffs2/security.c int jffs2_init_security(struct inode *inode, struct

Quoted 9 lines
fs/hfsplus/xattr_user.c +1 -0
+                              int flags)
 {
 
      return hfsplus_getxattr(inode, name, buffer, size,
fs/jffs2/security.c +0 -0
index c2332e30f218..e6f42fe435af 100644
@@ -50,7 +50,8 @@ int jffs2_init_security(struct inode *inode, struct

inode *dir,

fs/jffs2/security.c int jffs2_init_security(struct inode *inode, struct inode *dir,

Quoted 3 lines
fs/jffs2/security.c +0 -0
 /* ---- XATTR Handler for "security.*" ----------------- */
 static int jffs2_security_getxattr(const struct xattr_handler *handler,
                                 struct dentry *unused, struct inode

*inode,

fs/jffs2/security.c int jffs2_init_security(struct inode *inode, struct · line 53

Quoted 1 line
fs/jffs2/security.c +0 -1
-                                const char *name, void *buffer, size_t

size)

fs/jffs2/security.c int jffs2_init_security(struct inode *inode, struct · line 53

Quoted 1 line
fs/jffs2/security.c +1 -0
+                                const char *name, void *buffer, size_t

size,

fs/jffs2/xattr_trusted.c line 20

Quoted 12 lines
fs/jffs2/security.c +1 -0
+                                int flags)
 {
      return do_jffs2_getxattr(inode, JFFS2_XPREFIX_SECURITY,
                               name, buffer, size);
fs/jffs2/xattr_trusted.c +0 -0
index 5d6030826c52..9dccaae549f5 100644
@@ -18,7 +18,8 @@
 
 static int jffs2_trusted_getxattr(const struct xattr_handler *handler,
                                struct dentry *unused, struct inode

*inode,

fs/jffs2/xattr_trusted.c line 21

Quoted 1 line
fs/jffs2/xattr_trusted.c +0 -1
-                               const char *name, void *buffer, size_t

size)

fs/jffs2/xattr_trusted.c line 21

Quoted 1 line
fs/jffs2/xattr_trusted.c +1 -0
+                               const char *name, void *buffer, size_t

size,

fs/jfs/xattr.c static int __jfs_xattr_set(struct inode *inode,

Quoted 23 lines
fs/jffs2/xattr_trusted.c +1 -0
+                               int flags)
 {
      return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED,
                               name, buffer, size);
fs/jffs2/xattr_user.c +2 -1
index 9d027b4abcf9..c0983a3e810b 100644
@@ -18,7 +18,8 @@
 
 static int jffs2_user_getxattr(const struct xattr_handler *handler,
                             struct dentry *unused, struct inode *inode,
-                            const char *name, void *buffer, size_t size)
+                            const char *name, void *buffer, size_t size,
+                            int flags)
 {
      return do_jffs2_getxattr(inode, JFFS2_XPREFIX_USER,
                               name, buffer, size);
fs/jfs/xattr.c +0 -0
index db41e7803163..5c79a35bf62f 100644
@@ -925,7 +925,7 @@ static int __jfs_xattr_set(struct inode *inode,

const char *name,

fs/jfs/xattr.c static int __jfs_xattr_set(struct inode *inode, const char *name,

Quoted 5 lines
fs/jfs/xattr.c +1 -1
 static int jfs_xattr_get(const struct xattr_handler *handler,
                       struct dentry *unused, struct inode *inode,
-                      const char *name, void *value, size_t size)
+                      const char *name, void *value, size_t size, int

flags)

fs/jfs/xattr.c static int jfs_xattr_set(const struct xattr_handler

Quoted 4 lines
fs/jfs/xattr.c +0 -0
 {
      name = xattr_full_name(handler, name);
      return __jfs_getxattr(inode, name, value, size);
@@ -942,7 +942,8 @@ static int jfs_xattr_set(const struct xattr_handler

*handler,

fs/kernfs/inode.c int kernfs_xattr_set(struct kernfs_node *kn, const

Quoted 14 lines
fs/jfs/xattr.c +2 -1
 static int jfs_xattr_get_os2(const struct xattr_handler *handler,
                           struct dentry *unused, struct inode *inode,
-                          const char *name, void *value, size_t size)
+                          const char *name, void *value, size_t size,
+                          int flags)
 {
      if (is_known_namespace(name))
              return -EOPNOTSUPP;
fs/kernfs/inode.c +0 -0
index f3f3984cce80..89db24ce644e 100644
@@ -309,7 +309,8 @@ int kernfs_xattr_set(struct kernfs_node *kn, const

char *name,

fs/kernfs/inode.c int kernfs_xattr_set(struct kernfs_node *kn, const char *name,

Quoted 4 lines
fs/kernfs/inode.c +0 -1
 static int kernfs_vfs_xattr_get(const struct xattr_handler *handler,
                              struct dentry *unused, struct inode *inode,
-                             const char *suffix, void *value, size_t

size)

fs/kernfs/inode.c int kernfs_xattr_set(struct kernfs_node *kn, const · line 311

Quoted 1 line
fs/kernfs/inode.c +1 -0
+                             const char *suffix, void *value, size_t

size,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_acl(const struct

Quoted 9 lines
fs/kernfs/inode.c +1 -0
+                             int flags)
 {
      const char *name = xattr_full_name(handler, suffix);
      struct kernfs_node *kn = inode->i_private;
fs/nfs/nfs4proc.c +0 -0
index 1406858bae6c..1905597f86fb 100644
@@ -7218,7 +7218,8 @@ static int nfs4_xattr_set_nfs4_acl(const struct

xattr_handler *handler,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_acl(const struct · line 7219

Quoted 3 lines
fs/nfs/nfs4proc.c +0 -0
 static int nfs4_xattr_get_nfs4_acl(const struct xattr_handler *handler,
                                 struct dentry *unused, struct inode

*inode,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_acl(const struct · line 7220

Quoted 1 line
fs/nfs/nfs4proc.c +0 -1
-                                const char *key, void *buf, size_t

buflen)

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_acl(const struct · line 7220

Quoted 1 line
fs/nfs/nfs4proc.c +1 -0
+                                const char *key, void *buf, size_t

buflen,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_label(const struct

Quoted 5 lines
fs/nfs/nfs4proc.c +1 -0
+                                int flags)
 {
      return nfs4_proc_get_acl(inode, buf, buflen);
 }
@@ -7243,7 +7244,8 @@ static int nfs4_xattr_set_nfs4_label(const struct

xattr_handler *handler,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_label(const struct · line 7244

Quoted 2 lines
fs/nfs/nfs4proc.c +0 -0
 static int nfs4_xattr_get_nfs4_label(const struct xattr_handler

*handler,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_label(const struct · line 7245

Quoted 1 line
fs/nfs/nfs4proc.c +0 -0
                                   struct dentry *unused, struct inode

*inode,

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_label(const struct · line 7245

Quoted 1 line
fs/nfs/nfs4proc.c +0 -1
-                                  const char *key, void *buf, size_t

buflen)

fs/nfs/nfs4proc.c static int nfs4_xattr_set_nfs4_label(const struct · line 7246

Quoted 1 line
fs/nfs/nfs4proc.c +1 -0
+                                  const char *key, void *buf, size_t

buflen,

fs/ocfs2/xattr.c int ocfs2_init_security_and_acl(struct inode *dir, · line 7244

Quoted 12 lines
fs/nfs/nfs4proc.c +1 -0
+                                  int flags)
 {
      if (security_ismaclabel(key))
              return nfs4_get_security_label(inode, buf, buflen);
fs/ocfs2/xattr.c +0 -0
index 90c830e3758e..525835807c86 100644
@@ -7242,7 +7242,8 @@ int ocfs2_init_security_and_acl(struct inode *dir,
  */
 static int ocfs2_xattr_security_get(const struct xattr_handler *handler,
                                  struct dentry *unused, struct inode

*inode,

fs/ocfs2/xattr.c int ocfs2_init_security_and_acl(struct inode *dir, · line 7245

Quoted 1 line
fs/ocfs2/xattr.c +0 -1
-                                 const char *name, void *buffer, size_t

size)

fs/ocfs2/xattr.c int ocfs2_init_security_and_acl(struct inode *dir, · line 7245

Quoted 1 line
fs/ocfs2/xattr.c +1 -0
+                                 const char *name, void *buffer, size_t

size,

fs/ocfs2/xattr.c const struct xattr_handler

Quoted 5 lines
fs/ocfs2/xattr.c +1 -0
+                                 int flags)
 {
      return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_SECURITY,
                             name, buffer, size);
@@ -7314,7 +7315,8 @@ const struct xattr_handler

ocfs2_xattr_security_handler = {

fs/ocfs2/xattr.c const struct xattr_handler ocfs2_xattr_security_handler = {

Quoted 3 lines
fs/ocfs2/xattr.c +0 -0
  */
 static int ocfs2_xattr_trusted_get(const struct xattr_handler *handler,
                                 struct dentry *unused, struct inode

*inode,

fs/ocfs2/xattr.c const struct xattr_handler · line 7317

Quoted 1 line
fs/ocfs2/xattr.c +0 -1
-                                const char *name, void *buffer, size_t

size)

fs/ocfs2/xattr.c const struct xattr_handler · line 7318

Quoted 1 line
fs/ocfs2/xattr.c +1 -0
+                                const char *name, void *buffer, size_t

size,

fs/ocfs2/xattr.c const struct xattr_handler

Quoted 5 lines
fs/ocfs2/xattr.c +1 -0
+                                int flags)
 {
      return ocfs2_xattr_get(inode, OCFS2_XATTR_INDEX_TRUSTED,
                             name, buffer, size);
@@ -7340,7 +7342,8 @@ const struct xattr_handler

ocfs2_xattr_trusted_handler = {

fs/ocfs2/xattr.c const struct xattr_handler ocfs2_xattr_trusted_handler = {

Quoted 4 lines
fs/ocfs2/xattr.c +0 -1
  */
 static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
                              struct dentry *unused, struct inode *inode,
-                             const char *name, void *buffer, size_t

size)

fs/ocfs2/xattr.c const struct xattr_handler · line 7345

Quoted 1 line
fs/ocfs2/xattr.c +1 -0
+                             const char *name, void *buffer, size_t

size,

fs/orangefs/xattr.c static int orangefs_xattr_get_default(const struct

Quoted 9 lines
fs/ocfs2/xattr.c +1 -0
+                             int flags)
 {
      struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
 
fs/orangefs/xattr.c +0 -0
index bdc285aea360..ef4180bff7bb 100644
@@ -541,7 +541,8 @@ static int orangefs_xattr_get_default(const struct

xattr_handler *handler,

Quoted 14 lines
fs/orangefs/xattr.c +2 -1
                                    struct inode *inode,
                                    const char *name,
                                    void *buffer,
-                                   size_t size)
+                                   size_t size,
+                                   int flags)
 {
      return orangefs_inode_getxattr(inode, name, buffer, size);
 
fs/overlayfs/super.c +0 -0
index b368e2e102fa..a7b21f2ea2dd 100644

fs/overlayfs/super.c static unsigned int ovl_split_lowerdirs(char *str) · line 857

Quoted 5 lines
fs/overlayfs/super.c +1 -1
@@ -854,7 +854,7 @@ static unsigned int ovl_split_lowerdirs(char *str)
 static int __maybe_unused
 ovl_posix_acl_xattr_get(const struct xattr_handler *handler,
                      struct dentry *dentry, struct inode *inode,
-                     const char *name, void *buffer, size_t size)
+                     const char *name, void *buffer, size_t size, int

flags)

fs/overlayfs/super.c ovl_posix_acl_xattr_set(const struct xattr_handler

Quoted 4 lines
fs/overlayfs/super.c +0 -0
 {
      return ovl_xattr_get(dentry, inode, handler->name, buffer, size);
 }
@@ -919,7 +919,8 @@ ovl_posix_acl_xattr_set(const struct xattr_handler

*handler,

fs/overlayfs/super.c static int ovl_own_xattr_set(const struct

Quoted 10 lines
fs/overlayfs/super.c +2 -1
 static int ovl_own_xattr_get(const struct xattr_handler *handler,
                           struct dentry *dentry, struct inode *inode,
-                          const char *name, void *buffer, size_t size)
+                          const char *name, void *buffer, size_t size,
+                          int flags)
 {
      return -EOPNOTSUPP;
 }
@@ -934,7 +935,8 @@ static int ovl_own_xattr_set(const struct

xattr_handler *handler,

Quoted 27 lines
fs/overlayfs/super.c +2 -1
 static int ovl_other_xattr_get(const struct xattr_handler *handler,
                             struct dentry *dentry, struct inode *inode,
-                            const char *name, void *buffer, size_t size)
+                            const char *name, void *buffer, size_t size,
+                            int flags)
 {
      return ovl_xattr_get(dentry, inode, name, buffer, size);
 }
fs/posix_acl.c +1 -1
index 84ad1c90d535..cd55621e570b 100644
@@ -832,7 +832,7 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
 static int
 posix_acl_xattr_get(const struct xattr_handler *handler,
                  struct dentry *unused, struct inode *inode,
-                 const char *name, void *value, size_t size)
+                 const char *name, void *value, size_t size, int flags)
 {
      struct posix_acl *acl;
      int error;
fs/reiserfs/xattr_security.c +0 -0
index 20be9a0e5870..eedfa07a4fd0 100644

fs/reiserfs/xattr_security.c line 14

Quoted 4 lines
fs/reiserfs/xattr_security.c +0 -1
@@ -11,7 +11,8 @@
 
 static int
 security_get(const struct xattr_handler *handler, struct dentry *unused,
-          struct inode *inode, const char *name, void *buffer, size_t

size)

fs/reiserfs/xattr_security.c line 14

Quoted 1 line
fs/reiserfs/xattr_security.c +1 -0
+          struct inode *inode, const char *name, void *buffer, size_t

size,

fs/reiserfs/xattr_trusted.c line 13

Quoted 13 lines
fs/reiserfs/xattr_security.c +1 -0
+          int flags)
 {
      if (IS_PRIVATE(inode))
              return -EPERM;
fs/reiserfs/xattr_trusted.c +0 -1
index 5ed48da3d02b..2d11d98605dd 100644
@@ -10,7 +10,8 @@
 
 static int
 trusted_get(const struct xattr_handler *handler, struct dentry *unused,
-         struct inode *inode, const char *name, void *buffer, size_t

size)

fs/reiserfs/xattr_trusted.c line 13

Quoted 1 line
fs/reiserfs/xattr_trusted.c +1 -0
+         struct inode *inode, const char *name, void *buffer, size_t

size,

fs/squashfs/xattr.c static int squashfs_xattr_handler_get(const struct

Quoted 23 lines
fs/reiserfs/xattr_trusted.c +1 -0
+         int flags)
 {
      if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))
              return -EPERM;
fs/reiserfs/xattr_user.c +2 -1
index a573ca45bacc..2a59d85c69c9 100644
@@ -9,7 +9,8 @@
 
 static int
 user_get(const struct xattr_handler *handler, struct dentry *unused,
-      struct inode *inode, const char *name, void *buffer, size_t size)
+      struct inode *inode, const char *name, void *buffer, size_t size,
+      int flags)
 {
      if (!reiserfs_xattrs_user(inode->i_sb))
              return -EOPNOTSUPP;
fs/squashfs/xattr.c +0 -0
index e1e3f3dd5a06..d8d58c990652 100644
@@ -204,7 +204,7 @@ static int squashfs_xattr_handler_get(const struct

xattr_handler *handler,

fs/ubifs/xattr.c int ubifs_init_security(struct inode *dentry, struct

Quoted 13 lines
fs/squashfs/xattr.c +1 -1
                                    struct dentry *unused,
                                    struct inode *inode,
                                    const char *name,
-                                   void *buffer, size_t size)
+                                   void *buffer, size_t size, int flags)
 {
      return squashfs_xattr_get(inode, handler->flags, name,
              buffer, size);
fs/ubifs/xattr.c +0 -0
index 9aefbb60074f..26e1a74f178e 100644
@@ -669,7 +669,8 @@ int ubifs_init_security(struct inode *dentry, struct

inode *inode,

fs/xattr.c vfs_getxattr_alloc(struct dentry *dentry, const char

Quoted 14 lines
fs/ubifs/xattr.c +2 -1
 static int xattr_get(const struct xattr_handler *handler,
                         struct dentry *dentry, struct inode *inode,
-                        const char *name, void *buffer, size_t size)
+                        const char *name, void *buffer, size_t size,
+                        int flags)
 {
      dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name,
              inode->i_ino, dentry, size);
fs/xattr.c +0 -0
index 90dd78f0eb27..71f887518d6f 100644
@@ -281,7 +281,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char

*name, char **xattr_value,

fs/xattr.c vfs_getxattr_alloc(struct dentry *dentry, const

Quoted 9 lines
fs/xattr.c +1 -1
              return PTR_ERR(handler);
      if (!handler->get)
              return -EOPNOTSUPP;
-     error = handler->get(handler, dentry, inode, name, NULL, 0);
+     error = handler->get(handler, dentry, inode, name, NULL, 0, 0);
      if (error < 0)
              return error;
 
@@ -292,32 +292,20 @@ vfs_getxattr_alloc(struct dentry *dentry, const

char *name, char **xattr_value,

fs/xattr.c vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,

Quoted 5 lines
fs/xattr.c +1 -1
              memset(value, 0, error + 1);
      }
 
-     error = handler->get(handler, dentry, inode, name, value, error);
+     error = handler->get(handler, dentry, inode, name, value, error,

0);

fs/xattr.c vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,

Quoted 6 lines
fs/xattr.c +0 -0
      *xattr_value = value;
      return error;
 }
 
 ssize_t
 __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char

*name,

Quoted 6 lines
fs/xattr.c +1 -3
-            void *value, size_t size)
+            void *value, size_t size, int flags)
 {
      const struct xattr_handler *handler;
-
-     handler = xattr_resolve_name(inode, &name);

fs/xattr.c vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,

Quoted 10 lines
fs/xattr.c +0 -10
-     if (IS_ERR(handler))
-             return PTR_ERR(handler);
-     if (!handler->get)
-             return -EOPNOTSUPP;
-     return handler->get(handler, dentry, inode, name, value, size);
-}
-EXPORT_SYMBOL(__vfs_getxattr);
-
-ssize_t
-vfs_getxattr(struct dentry *dentry, const char *name, void *value,

size_t size)

fs/xattr.c vfs_getxattr(struct dentry *dentry, const char

Quoted 10 lines
fs/xattr.c +2 -2
-{
-     struct inode *inode = dentry->d_inode;
      int error;
 
+     if (flags & XATTR_NOSECURITY)
+             goto nolsm;
      error = xattr_permission(inode, name, MAY_READ);
      if (error)
              return error;
@@ -339,7 +327,19 @@ vfs_getxattr(struct dentry *dentry, const char

*name, void *value, size_t size)

fs/xattr.c vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)

Quoted 10 lines
fs/xattr.c +6 -1
              return ret;
      }
 nolsm:
-     return __vfs_getxattr(dentry, inode, name, value, size);
+     handler = xattr_resolve_name(inode, &name);
+     if (IS_ERR(handler))
+             return PTR_ERR(handler);
+     if (!handler->get)
+             return -EOPNOTSUPP;
+     return handler->get(handler, dentry, inode, name, value, size,

flags);

fs/xattr.c vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)

Quoted 5 lines
fs/xattr.c +5 -0
+}
+EXPORT_SYMBOL(__vfs_getxattr);
+
+ssize_t
+vfs_getxattr(struct dentry *dentry, const char *name, void *value,

size_t size)

fs/xattr.c vfs_getxattr(struct dentry *dentry, const char · line 342

Quoted 2 lines
fs/xattr.c +2 -0
+{
+     return __vfs_getxattr(dentry, dentry->d_inode, name, value, size,

0);

fs/xfs/xfs_xattr.c line 20

Quoted 11 lines
fs/xattr.c +0 -0
 }
 EXPORT_SYMBOL_GPL(vfs_getxattr);
 
fs/xfs/xfs_xattr.c +0 -0
index 3123b5aaad2a..cafc99c48e20 100644
@@ -18,7 +18,8 @@
 
 static int
 xfs_xattr_get(const struct xattr_handler *handler, struct dentry

*unused,

fs/xfs/xfs_xattr.c line 21

Quoted 1 line
fs/xfs/xfs_xattr.c +0 -1
-             struct inode *inode, const char *name, void *value, size_t

size)

fs/xfs/xfs_xattr.c line 21

Quoted 1 line
fs/xfs/xfs_xattr.c +1 -0
+             struct inode *inode, const char *name, void *value, size_t

size,

Quoted 9 lines
fs/xfs/xfs_xattr.c +1 -0
+             int flags)
 {
      int xflags = handler->flags;
      struct xfs_inode *ip = XFS_I(inode);
include/linux/xattr.h +0 -0
index 6dad031be3c2..4df9dcdc48c5 100644

include/linux/xattr.h struct xattr_handler { · line 33

Quoted 5 lines
include/linux/xattr.h +1 -1
@@ -30,10 +30,10 @@ struct xattr_handler {
      const char *prefix;
      int flags;      /* fs private flags */
      bool (*list)(struct dentry *dentry);
-     int (*get)(const struct xattr_handler *, struct dentry *dentry,
+     int (*get)(const struct xattr_handler *handler, struct dentry

*dentry,

include/linux/xattr.h struct xattr_handler {

Quoted 5 lines
include/linux/xattr.h +2 -2
                 struct inode *inode, const char *name, void *buffer,
-                size_t size);
-     int (*set)(const struct xattr_handler *, struct dentry *dentry,
+                size_t size, int flags);
+     int (*set)(const struct xattr_handler *handler, struct dentry

*dentry,

include/linux/xattr.h struct xattr_handler { · line 37

Quoted 1 line
include/linux/xattr.h +0 -0
                 struct inode *inode, const char *name, const void

*buffer,

include/linux/xattr.h struct xattr { · line 49

Quoted 7 lines
include/linux/xattr.h +0 -1
                 size_t size, int flags);
 };
@@ -46,7 +46,8 @@ struct xattr {
      size_t value_len;
 };
 
-ssize_t __vfs_getxattr(struct dentry *, struct inode *, const char *,

void *, size_t);

include/linux/xattr.h struct xattr { · line 50

Quoted 2 lines
include/linux/xattr.h +2 -0
+ssize_t __vfs_getxattr(struct dentry *dentry, struct inode *inode,
+                    const char *name, void *buffer, size_t size, int

flags);

include/linux/xattr.h struct xattr {

Quoted 3 lines
include/linux/xattr.h +0 -0
 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
 int __vfs_setxattr(struct dentry *, struct inode *, const char *, const

void *, size_t, int);

include/uapi/linux/xattr.h line 20

Quoted 9 lines
include/uapi/linux/xattr.h +0 -1
index c1395b5bd432..1eba02616274 100644
@@ -17,8 +17,11 @@
 #if __UAPI_DEF_XATTR
 #define __USE_KERNEL_XATTR_DEFS
 
-#define XATTR_CREATE 0x1     /* set value, fail if attr already exists

*/

include/uapi/linux/xattr.h line 21

Quoted 1 line
include/uapi/linux/xattr.h +0 -1
-#define XATTR_REPLACE        0x2     /* set value, fail if attr does

not exist */

include/uapi/linux/xattr.h line 20

Quoted 1 line
include/uapi/linux/xattr.h +1 -0
+#define XATTR_CREATE  0x1    /* set value, fail if attr already exists

*/

include/uapi/linux/xattr.h line 21

Quoted 1 line
include/uapi/linux/xattr.h +1 -0
+#define XATTR_REPLACE         0x2    /* set value, fail if attr does

not exist */

include/uapi/linux/xattr.h line 22

Quoted 1 line
include/uapi/linux/xattr.h +1 -0
+#ifdef __KERNEL__ /* following is kernel internal, colocated for

maintenance */

include/uapi/linux/xattr.h line 23

Quoted 1 line
include/uapi/linux/xattr.h +1 -0
+#define XATTR_NOSECURITY 0x4 /* get value, do not involve security

check */

mm/shmem.c static int shmem_initxattrs(struct inode *inode, · line 3208

Quoted 12 lines
include/uapi/linux/xattr.h +1 -0
+#endif
 #endif
 
 /* Namespaces */
mm/shmem.c +0 -0
index 2bed4761f279..1013fcbd0a94 100644
@@ -3206,7 +3206,8 @@ static int shmem_initxattrs(struct inode *inode,
 
 static int shmem_xattr_handler_get(const struct xattr_handler *handler,
                                 struct dentry *unused, struct inode

*inode,

mm/shmem.c static int shmem_initxattrs(struct inode *inode, · line 3209

Quoted 1 line
mm/shmem.c +0 -1
-                                const char *name, void *buffer, size_t

size)

mm/shmem.c static int shmem_initxattrs(struct inode *inode, · line 3209

Quoted 1 line
mm/shmem.c +1 -0
+                                const char *name, void *buffer, size_t

size,

net/socket.c static const struct dentry_operations

Quoted 9 lines
mm/shmem.c +1 -0
+                                int flags)
 {
      struct shmem_inode_info *info = SHMEM_I(inode);
 
net/socket.c +0 -0
index 6a9ab7a8b1d2..6b0fea92dd02 100644
@@ -300,7 +300,8 @@ static const struct dentry_operations

sockfs_dentry_operations = {

security/commoncap.c int get_vfs_caps_from_disk(const struct dentry

Quoted 24 lines
net/socket.c +2 -1
 static int sockfs_xattr_get(const struct xattr_handler *handler,
                          struct dentry *dentry, struct inode *inode,
-                         const char *suffix, void *value, size_t size)
+                         const char *suffix, void *value, size_t size,
+                         int flags)
 {
      if (value) {
              if (dentry->d_name.len + 1 > size)
security/commoncap.c +2 -1
index f4ee0ae106b2..378a2f66a73d 100644
@@ -297,7 +297,8 @@ int cap_inode_need_killpriv(struct dentry *dentry)
      struct inode *inode = d_backing_inode(dentry);
      int error;
 
-     error = __vfs_getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0);
+     error = __vfs_getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0,
+                            XATTR_NOSECURITY);
      return error > 0;
 }
 
@@ -586,7 +587,8 @@ int get_vfs_caps_from_disk(const struct dentry

*dentry, struct cpu_vfs_cap_data

Review

Quoted 10 lines
security/commoncap.c +2 -1
      fs_ns = inode->i_sb->s_user_ns;
      size = __vfs_getxattr((struct dentry *)dentry, inode,
-                           XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ);
+                           XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ,
+                           XATTR_NOSECURITY);
      if (size == -ENODATA || size == -EOPNOTSUPP)
              /* no data, that's ok */
              return -ENODATA;
(quoted diff) +0 -0

b/security/integrity/evm/evm_main.c

security/integrity/evm/evm_main.c static int evm_find_protected_xattrs(struct dentry

Quoted 4 lines

index f9a81b187fae..921c8f2afcaf 100644

security/integrity/evm/evm_main.c +0 -0
@@ -100,7 +100,8 @@ static int evm_find_protected_xattrs(struct dentry

*dentry)

security/integrity/evm/evm_main.c static int evm_find_protected_xattrs(struct dentry *dentry)

Quoted 4 lines
security/integrity/evm/evm_main.c +0 -1
              return -EOPNOTSUPP;
 
      list_for_each_entry_rcu(xattr, &evm_config_xattrnames, list) {
-             error = __vfs_getxattr(dentry, inode, xattr->name, NULL,

0);

Quoted 10 lines
security/integrity/evm/evm_main.c +2 -0
+             error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0,
+                                    XATTR_NOSECURITY);
              if (error < 0) {
                      if (error == -ENODATA)
                              continue;
security/selinux/hooks.c +0 -0
index 74dd46de01b6..b0822da0658f 100644

security/selinux/hooks.c static int sb_finish_set_opts(struct super_block *sb) · line 555

Quoted 4 lines
security/selinux/hooks.c +0 -1
@@ -552,7 +552,8 @@ static int sb_finish_set_opts(struct super_block *sb)
                      goto out;
              }
 
-             rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX,

NULL, 0);

security/selinux/hooks.c static int sb_finish_set_opts(struct super_block *sb) · line 555

Quoted 1 line
security/selinux/hooks.c +1 -0
+             rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX,

NULL,

security/selinux/hooks.c static int inode_doinit_use_xattr(struct inode

Quoted 5 lines
security/selinux/hooks.c +1 -0
+                                 0, XATTR_NOSECURITY);
              if (rc < 0 && rc != -ENODATA) {
                      if (rc == -EOPNOTSUPP)
                              pr_warn("SELinux: (dev %s, type "
@@ -1378,12 +1379,14 @@ static int inode_doinit_use_xattr(struct inode

*inode, struct dentry *dentry,

security/selinux/hooks.c static int inode_doinit_use_xattr(struct inode *inode, struct dentry *dentry,

Quoted 4 lines
security/selinux/hooks.c +0 -1
              return -ENOMEM;
 
      context[len] = '\0';
-     rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context,

len);

security/selinux/hooks.c static int inode_doinit_use_xattr(struct inode · line 1382

Quoted 1 line
security/selinux/hooks.c +1 -0
+     rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context,

len,

security/selinux/hooks.c static int inode_doinit_use_xattr(struct inode *inode, struct dentry *dentry,

Quoted 6 lines
security/selinux/hooks.c +1 -1
+                         XATTR_NOSECURITY);
      if (rc == -ERANGE) {
              kfree(context);
 
              /* Need a larger buffer.  Query for the right size. */
-             rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX,

NULL, 0);

security/selinux/hooks.c static int inode_doinit_use_xattr(struct inode · line 1388

Quoted 1 line
security/selinux/hooks.c +1 -0
+             rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX,

NULL, 0,

security/selinux/hooks.c static int inode_doinit_use_xattr(struct inode

Quoted 5 lines
security/selinux/hooks.c +1 -0
+                                 XATTR_NOSECURITY);
              if (rc < 0)
                      return rc;
 
@@ -1394,7 +1397,7 @@ static int inode_doinit_use_xattr(struct inode

*inode, struct dentry *dentry,

security/smack/smack_lsm.c static struct smack_known *smk_fetch(const char

Quoted 13 lines
security/selinux/hooks.c +1 -1
              context[len] = '\0';
              rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX,
-                                 context, len);
+                                 context, len, XATTR_NOSECURITY);
      }
      if (rc < 0) {
              kfree(context);
security/smack/smack_lsm.c +0 -0
index 4c5e5a438f8b..158b35772be1 100644
@@ -292,7 +292,8 @@ static struct smack_known *smk_fetch(const char

*name, struct inode *ip,

security/smack/smack_lsm.c static void smack_d_instantiate(struct dentry

Quoted 10 lines
security/smack/smack_lsm.c +2 -1
      if (buffer == NULL)
              return ERR_PTR(-ENOMEM);
 
-     rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL);
+     rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL,
+                         XATTR_NOSECURITY);
      if (rc < 0)
              skp = ERR_PTR(rc);
      else if (rc == 0)
@@ -3442,7 +3443,7 @@ static void smack_d_instantiate(struct dentry

*opt_dentry, struct inode *inode)

security/smack/smack_lsm.c static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)

Quoted 7 lines
security/smack/smack_lsm.c +1 -1
                      } else {
                              rc = __vfs_getxattr(dp, inode,
                                      XATTR_NAME_SMACKTRANSMUTE, trattr,
-                                     TRANS_TRUE_SIZE);
+                                     TRANS_TRUE_SIZE, XATTR_NOSECURITY);
                              if (rc >= 0 && strncmp(trattr, TRANS_TRUE,
                                                     TRANS_TRUE_SIZE) !=

0)

Quoted 4 lines
security/smack/smack_lsm.c +0 -1
                                      rc = -EINVAL;
--

2.23.0.rc1.153.gdeed80330f-goog

--
Jan Kara <[email protected]>
SUSE Labs, CR

--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].