[gentoo-commits] proj/linux-patches:6.2 commit in: /

["Mike Pagano" <mpagano@gentoo.org>]

commit:     1c3a77c0734cfe6d829f2f1d90577e46b4de1a8f
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 23:08:27 2023 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 23:08:27 2023 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=1c3a77c0

Update namespace user.pax.* on tmpfs patch

Bug: https://bugs.gentoo.org/show_bug.cgi?id=903513

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 1500_XATTR_USER_PREFIX.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/1500_XATTR_USER_PREFIX.patch b/1500_XATTR_USER_PREFIX.patch
index fac3eed7..1d1a9301 100644
--- a/1500_XATTR_USER_PREFIX.patch
+++ b/1500_XATTR_USER_PREFIX.patch
@@ -26,12 +26,12 @@ the XATTR_PAX flags preserved.
 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
  
  #endif /* _UAPI_LINUX_XATTR_H */
---- a/mm/shmem.c	2022-11-22 05:57:29.011626215 -0500
-+++ b/mm/shmem.c	2022-11-22 06:03:33.165939400 -0500
-@@ -3297,6 +3297,14 @@ static int shmem_xattr_handler_set(const
- 	struct shmem_inode_info *info = SHMEM_I(inode);
+--- a/mm/shmem.c	2023-03-29 18:54:52.431866914 -0400
++++ b/mm/shmem.c	2023-03-29 18:57:55.145689335 -0400
+@@ -3310,6 +3310,14 @@ static int shmem_xattr_handler_set(const
  	int err;
  
+ 	name = xattr_full_name(handler, name);
 +
 +	if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
 +		if (strcmp(name, XATTR_NAME_PAX_FLAGS))
@@ -40,10 +40,10 @@ the XATTR_PAX flags preserved.
 +			return -EINVAL;
 +	}
 +
- 	name = xattr_full_name(handler, name);
  	err = simple_xattr_set(&info->xattrs, name, value, size, flags, NULL);
  	if (!err) {
-@@ -3312,6 +3320,12 @@ static const struct xattr_handler shmem_
+ 		inode->i_ctime = current_time(inode);
+@@ -3324,6 +3332,12 @@ static const struct xattr_handler shmem_
  	.set = shmem_xattr_handler_set,
  };
  
@@ -56,7 +56,7 @@ the XATTR_PAX flags preserved.
  static const struct xattr_handler shmem_trusted_xattr_handler = {
  	.prefix = XATTR_TRUSTED_PREFIX,
  	.get = shmem_xattr_handler_get,
-@@ -3325,6 +3339,7 @@ static const struct xattr_handler *shmem
+@@ -3337,6 +3351,7 @@ static const struct xattr_handler *shmem
  #endif
  	&shmem_security_xattr_handler,
  	&shmem_trusted_xattr_handler,