lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230413144651.3519980-1-broonie@kernel.org>
Date:   Thu, 13 Apr 2023 15:46:51 +0100
From:   broonie@...nel.org
To:     Gao Xiang <xiang@...nel.org>
Cc:     Christian Brauner <brauner@...nel.org>,
        Gao Xiang <hsiangkao@...ux.alibaba.com>,
        Jingbo Xu <jefflexu@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the erofs tree with the vfs-idmapping tree

Hi all,

Today's linux-next merge of the erofs tree got a conflict in:

  fs/erofs/xattr.c

between commit:

  a5488f29835c0 ("fs: simplify ->listxattr() implementation")

from the vfs-idmapping tree and commit:

  303f50cf89b24 ("erofs: handle long xattr name prefixes properly")

from the erofs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/erofs/xattr.c
index 015462763bdd5,a04724c816e5f..0000000000000
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@@ -483,12 -517,28 +513,26 @@@ static int xattr_entrylist(struct xattr
  {
  	struct listxattr_iter *it =
  		container_of(_it, struct listxattr_iter, it);
- 	unsigned int prefix_len;
- 	const char *prefix;
+ 	unsigned int base_index = entry->e_name_index;
+ 	unsigned int prefix_len, infix_len = 0;
+ 	const char *prefix, *infix = NULL;
+ 	const struct xattr_handler *h;
+ 
+ 	if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) {
+ 		struct erofs_sb_info *sbi = EROFS_SB(_it->sb);
+ 		struct erofs_xattr_prefix_item *pf = sbi->xattr_prefixes +
+ 			(entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK);
+ 
+ 		if (pf >= sbi->xattr_prefixes + sbi->xattr_prefix_count)
+ 			return 1;
+ 		infix = pf->prefix->infix;
+ 		infix_len = pf->infix_len;
+ 		base_index = pf->prefix->base_index;
+ 	}
  
- 	prefix = erofs_xattr_prefix(entry->e_name_index, it->dentry);
- 	if (!prefix)
+ 	h = erofs_xattr_handler(base_index);
+ 	if (!h || (h->list && !h->list(it->dentry)))
  		return 1;
 -
 -	prefix = xattr_prefix(h);
  	prefix_len = strlen(prefix);
  
  	if (!it->buffer) {

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ