FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr

Mark Salyzyn · cyberknight777 · commit 66cd757c9d98 · 2021-09-07T14:48:01.000+08:00
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 when called by security
infrastructure.

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) -&gt;
__vfs_getxattr(dentry...XATTR_NOSECURITY) -&gt;
handler-&gt;get(dentry...XATTR_NOSECURITY) -&gt;
__vfs_getxattr(lower_dentry...XATTR_NOSECURITY) -&gt;
lower_handler-&gt;get(lower_dentry...XATTR_NOSECURITY)
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) -&gt; __vfs_getxattr(dentry) -&gt;
handler-&gt;get(dentry) -&gt; vfs_getxattr(lower_dentry) -&gt; nested -&gt;
security(lower_dentry, log off) -&gt; lower_handler-&gt;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).

Signed-off-by: Mark Salyzyn &lt;salyzyn@android.com&gt;
Reviewed-by: Jan Kara &lt;jack@suse.cz&gt;
Acked-by: Jan Kara &lt;jack@suse.cz&gt;
Acked-by: Jeff Layton &lt;jlayton@kernel.org&gt;
Acked-by: David Sterba &lt;dsterba@suse.com&gt;
Acked-by: Darrick J. Wong &lt;darrick.wong@oracle.com&gt;
Acked-by: Mike Marshall &lt;hubcap@omnibond.com&gt;
Cc: Stephen Smalley &lt;sds@tycho.nsa.gov&gt;
Cc: linux-kernel@vger.kernel.org
Cc: kernel-team@android.com
Cc: linux-security-module@vger.kernel.org

(cherry picked from (rejected from archive because of too many recipients))
Signed-off-by: Mark Salyzyn &lt;salyzyn@google.com&gt;
Bug: 133515582
Bug: 136124883
Bug: 129319403
Change-Id: Iabbb8771939d5f66667a26bb23ddf4c562c349a1
Signed-off-by: Park Ju Hyung &lt;qkrwngud825@gmail.com&gt;
Signed-off-by: Jebaitedneko &lt;Jebaitedneko@gmail.com&gt;
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
@@ -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;
diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c
@@ -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);
 
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
@@ -377,7 +377,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);
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
@@ -1085,7 +1085,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;
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
@@ -193,7 +193,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;
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
@@ -1039,7 +1039,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;
@@ -1124,7 +1125,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);
 }
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
@@ -438,7 +438,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);
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
@@ -11,7 +11,7 @@
 static int
 ext2_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 ext2_xattr_get(inode, EXT2_XATTR_INDEX_SECURITY, name,
 			      buffer, size);
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
@@ -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);
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c
@@ -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;
diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
@@ -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);
diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
@@ -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);
diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
@@ -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;
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
@@ -46,7 +46,7 @@ static void xattr_free(struct f2fs_sb_info *sbi, void *xattr_addr,
 
 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);
 
@@ -101,7 +101,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;
diff --git a/fs/fuse/xattr.c b/fs/fuse/xattr.c
@@ -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);
 }
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
@@ -612,7 +612,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;
diff --git a/fs/hfs/attr.c b/fs/hfs/attr.c
@@ -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);
 }
diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
@@ -845,7 +845,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
diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
@@ -16,7 +16,8 @@
 
 static int hfsplus_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 hfsplus_getxattr(inode, name, buffer, size,
 				XATTR_SECURITY_PREFIX,
diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
@@ -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,
diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
@@ -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,
diff --git a/fs/jffs2/security.c b/fs/jffs2/security.c
@@ -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);
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c
@@ -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);
diff --git a/fs/jffs2/xattr_user.c b/fs/jffs2/xattr_user.c
@@ -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);
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
@@ -938,7 +938,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);
@@ -955,7 +955,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;
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
@@ -307,7 +307,8 @@ int kernfs_iop_permission(struct inode *inode, int mask)
 
 static int kernfs_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;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
@@ -6805,7 +6805,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);
 }
@@ -6830,7 +6831,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);
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
@@ -7249,7 +7249,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);
@@ -7321,7 +7322,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);
@@ -7347,7 +7349,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);
 
diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
@@ -437,7 +437,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);
 
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
@@ -256,7 +256,7 @@ int __ovl_xattr_get(struct dentry *dentry, struct inode *inode,
 
 	old_cred = ovl_override_creds(dentry->d_sb);
 	res = __vfs_getxattr(realdentry, d_inode(realdentry), name, value,
-			     size);
+			     size, XATTR_NOSECURITY);
 	ovl_revert_creds(old_cred);
 	return res;
 }
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
@@ -728,7 +728,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);
 }
@@ -801,7 +801,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;
 }
@@ -816,7 +817,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);
 }
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
@@ -55,7 +55,7 @@ void ovl_revert_creds(const struct cred *old_cred)
 ssize_t ovl_vfs_getxattr(struct dentry *dentry, const char *name, void *buf,
 			 size_t size)
 {
-	return __vfs_getxattr(dentry, d_inode(dentry), name, buf, size);
+	return __vfs_getxattr(dentry, d_inode(dentry), name, buf, size, XATTR_NOSECURITY);
 }
 
 struct super_block *ovl_same_sb(struct super_block *sb)
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
@@ -831,7 +831,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;
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c
diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c
diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c
diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
diff --git a/fs/xattr.c b/fs/xattr.c
diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
diff --git a/mm/shmem.c b/mm/shmem.c
diff --git a/net/socket.c b/net/socket.c
diff --git a/security/commoncap.c b/security/commoncap.c
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,8 @@ int v9fs_acl_mode(struct inode dir, umode_t modep,`
`214`	`214`
`215`	`215`	`static int v9fs_xattr_get_acl(const struct xattr_handler *handler,`
`216`	`216`	`struct dentry dentry, struct inode inode,`
`217`		`- const char name, void buffer, size_t size)`
	`217`	`+ const char name, void buffer, size_t size,`
	`218`	`+ int flags)`
`218`	`219`	`{`
`219`	`220`	`struct v9fs_session_info *v9ses;`
`220`	`221`	`struct posix_acl *acl;`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ ssize_t v9fs_listxattr(struct dentry dentry, char buffer, size_t buffer_size)`
`139`	`139`
`140`	`140`	`static int v9fs_xattr_handler_get(const struct xattr_handler *handler,`
`141`	`141`	`struct dentry dentry, struct inode inode,`
`142`		`- const char name, void buffer, size_t size)`
	`142`	`+ const char name, void buffer, size_t size,`
	`143`	`+ int flags)`
`143`	`144`	`{`
`144`	`145`	`const char *full_name = xattr_full_name(handler, name);`
`145`	`146`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,8 @@ ssize_t btrfs_listxattr(struct dentry dentry, char buffer, size_t size)`
`377`	`377`
`378`	`378`	`static int btrfs_xattr_handler_get(const struct xattr_handler *handler,`
`379`	`379`	`struct dentry unused, struct inode inode,`
`380`		`- const char name, void buffer, size_t size)`
	`380`	`+ const char name, void buffer, size_t size,`
	`381`	`+ int flags)`
`381`	`382`	`{`
`382`	`383`	`name = xattr_full_name(handler, name);`
`383`	`384`	`return __btrfs_getxattr(inode, name, buffer, size);`
Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,8 @@ int __ceph_setxattr(struct inode inode, const char name,`
`1085`	`1085`
`1086`	`1086`	`static int ceph_get_xattr_handler(const struct xattr_handler *handler,`
`1087`	`1087`	`struct dentry dentry, struct inode inode,`
`1088`		`- const char name, void value, size_t size)`
	`1088`	`+ const char name, void value, size_t size,`
	`1089`	`+ int flags)`
`1089`	`1090`	`{`
`1090`	`1091`	`if (!ceph_is_valid_xattr(name))`
`1091`	`1092`	`return -EOPNOTSUPP;`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ static int cifs_creation_time_get(struct dentry dentry, struct inode inode,`
`193`	`193`
`194`	`194`	`static int cifs_xattr_get(const struct xattr_handler *handler,`
`195`	`195`	`struct dentry dentry, struct inode inode,`
`196`		`- const char name, void value, size_t size)`
	`196`	`+ const char name, void value, size_t size, int flags)`
`197`	`197`	`{`
`198`	`198`	`ssize_t rc = -EOPNOTSUPP;`
`199`	`199`	`unsigned int xid;`
Original file line number	Diff line number	Diff line change
`@@ -1039,7 +1039,8 @@ ecryptfs_getxattr_lower(struct dentry lower_dentry, struct inode lower_inode,`
`1039`	`1039`	`goto out;`
`1040`	`1040`	`}`
`1041`	`1041`	`inode_lock(lower_inode);`
`1042`		`- rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size);`
	`1042`	`+ rc = __vfs_getxattr(lower_dentry, lower_inode, name, value, size,`
	`1043`	`+ XATTR_NOSECURITY);`
`1043`	`1044`	`inode_unlock(lower_inode);`
`1044`	`1045`	`out:`
`1045`	`1046`	`return rc;`
`@@ -1124,7 +1125,8 @@ const struct inode_operations ecryptfs_main_iops = {`
`1124`	`1125`
`1125`	`1126`	`static int ecryptfs_xattr_get(const struct xattr_handler *handler,`
`1126`	`1127`	`struct dentry dentry, struct inode inode,`
`1127`		`- const char name, void buffer, size_t size)`
	`1128`	`+ const char name, void buffer, size_t size,`
	`1129`	`+ int flags)`
`1128`	`1130`	`{`
`1129`	`1131`	`return ecryptfs_getxattr(dentry, inode, name, buffer, size);`
`1130`	`1132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode)`
`438`	`438`	`}`
`439`	`439`	`inode_lock(lower_inode);`
`440`	`440`	`size = __vfs_getxattr(lower_dentry, lower_inode, ECRYPTFS_XATTR_NAME,`
`441`		`- xattr_virt, PAGE_SIZE);`
	`441`	`+ xattr_virt, PAGE_SIZE, XATTR_NOSECURITY);`
`442`	`442`	`if (size < 0)`
`443`	`443`	`size = 8;`
`444`	`444`	`put_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`static int`
`12`	`12`	`ext2_xattr_security_get(const struct xattr_handler *handler,`
`13`	`13`	`struct dentry unused, struct inode inode,`
`14`		`- const char name, void buffer, size_t size)`
	`14`	`+ const char name, void buffer, size_t size, int flags)`
`15`	`15`	`{`
`16`	`16`	`return ext2_xattr_get(inode, EXT2_XATTR_INDEX_SECURITY, name,`
`17`	`17`	`buffer, size);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ ext2_xattr_trusted_list(struct dentry *dentry)`
`18`	`18`	`static int`
`19`	`19`	`ext2_xattr_trusted_get(const struct xattr_handler *handler,`
`20`	`20`	`struct dentry unused, struct inode inode,`
`21`		`- const char name, void buffer, size_t size)`
	`21`	`+ const char name, void buffer, size_t size, int flags)`
`22`	`22`	`{`
`23`	`23`	`return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name,`
`24`	`24`	`buffer, size);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ ext2_xattr_user_list(struct dentry *dentry)`
`20`	`20`	`static int`
`21`	`21`	`ext2_xattr_user_get(const struct xattr_handler *handler,`
`22`	`22`	`struct dentry unused, struct inode inode,`
`23`		`- const char name, void buffer, size_t size)`
	`23`	`+ const char name, void buffer, size_t size, int flags)`
`24`	`24`	`{`
`25`	`25`	`if (!test_opt(inode->i_sb, XATTR_USER))`
`26`	`26`	`return -EOPNOTSUPP;`