From nobody Wed Feb 11 15:24:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4EC2C77B6C for ; Fri, 7 Apr 2023 14:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240612AbjDGORf (ORCPT ); Fri, 7 Apr 2023 10:17:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240080AbjDGORW (ORCPT ); Fri, 7 Apr 2023 10:17:22 -0400 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 224BD72BC for ; Fri, 7 Apr 2023 07:17:20 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VfX8ext_1680877037; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VfX8ext_1680877037) by smtp.aliyun-inc.com; Fri, 07 Apr 2023 22:17:18 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 6/7] erofs: handle long xattr name prefixes properly Date: Fri, 7 Apr 2023 22:17:09 +0800 Message-Id: <20230407141710.113882-7-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230407141710.113882-1-jefflexu@linux.alibaba.com> References: <20230407141710.113882-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Make .{list,get}xattr routines adapted to long xattr name prefixes. When the bit 7 of erofs_xattr_entry.e_name_index is set, it indicates that it refers to a long xattr name prefix. Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang --- fs/erofs/xattr.c | 60 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index 684571e83a2c..8d81593655e8 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -301,11 +301,39 @@ struct getxattr_iter { struct qstr name; }; =20 +static int erofs_xattr_long_entrymatch(struct getxattr_iter *it, + struct erofs_xattr_entry *entry) +{ + struct erofs_sb_info *sbi =3D EROFS_SB(it->it.sb); + u8 idx =3D entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK; + struct erofs_xattr_prefix_item *pf; + + if (idx >=3D sbi->xattr_prefix_count) + return -ENOATTR; + + pf =3D &sbi->xattr_prefixes[idx]; + if (it->index !=3D pf->prefix->base_index) + return -ENOATTR; + + if (strncmp(it->name.name, pf->prefix->infix, pf->infix_len)) + return -ENOATTR; + + it->name.name +=3D pf->infix_len; + it->name.len -=3D pf->infix_len; + if (it->name.len !=3D entry->e_name_len) + return -ENOATTR; + return 0; +} + static int xattr_entrymatch(struct xattr_iter *_it, struct erofs_xattr_entry *entry) { struct getxattr_iter *it =3D container_of(_it, struct getxattr_iter, it); =20 + /* should also match the infix for long name prefixes */ + if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) + return erofs_xattr_long_entrymatch(it, entry); + return (it->index !=3D entry->e_name_index || it->name.len !=3D entry->e_name_len) ? -ENOATTR : 0; } @@ -487,12 +515,26 @@ static int xattr_entrylist(struct xattr_iter *_it, { struct listxattr_iter *it =3D container_of(_it, struct listxattr_iter, it); - unsigned int prefix_len; - const char *prefix; - - const struct xattr_handler *h =3D - erofs_xattr_handler(entry->e_name_index); + unsigned int base_index =3D entry->e_name_index; + unsigned int prefix_len, infix_len =3D 0; + const char *prefix, *infix =3D NULL; + const struct xattr_handler *h; + + if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) { + struct erofs_sb_info *sbi =3D EROFS_SB(_it->sb); + u8 idx =3D entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK; + struct erofs_xattr_prefix_item *pf; + + if (idx >=3D sbi->xattr_prefix_count) + return 1; + + pf =3D &sbi->xattr_prefixes[idx]; + infix =3D pf->prefix->infix; + infix_len =3D pf->infix_len; + base_index =3D pf->prefix->base_index; + } =20 + h =3D erofs_xattr_handler(base_index); if (!h || (h->list && !h->list(it->dentry))) return 1; =20 @@ -500,16 +542,18 @@ static int xattr_entrylist(struct xattr_iter *_it, prefix_len =3D strlen(prefix); =20 if (!it->buffer) { - it->buffer_ofs +=3D prefix_len + entry->e_name_len + 1; + it->buffer_ofs +=3D prefix_len + infix_len + + entry->e_name_len + 1; return 1; } =20 - if (it->buffer_ofs + prefix_len + if (it->buffer_ofs + prefix_len + infix_len + + entry->e_name_len + 1 > it->buffer_size) return -ERANGE; =20 memcpy(it->buffer + it->buffer_ofs, prefix, prefix_len); - it->buffer_ofs +=3D prefix_len; + memcpy(it->buffer + it->buffer_ofs + prefix_len, infix, infix_len); + it->buffer_ofs +=3D prefix_len + infix_len; return 0; } =20 --=20 2.19.1.6.gb485710b