Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp530872rwd; Wed, 31 May 2023 01:37:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Hth/YrNmXEmB4qEZo5P/tgd4JVrmb2ozkFdlBiy/1j5krWOnu8dd+m4onTC+y49kVU5Gy X-Received: by 2002:a05:6214:20ab:b0:5c1:fa35:fe6 with SMTP id 11-20020a05621420ab00b005c1fa350fe6mr5130049qvd.24.1685522238010; Wed, 31 May 2023 01:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685522237; cv=none; d=google.com; s=arc-20160816; b=NSC7EVWWZFR3KdevJ6TwfaDZ8sD2Wr0hCGeKTSMEGfxXpa12KW+OophuAbvL9q9I0K zvSuIN8El5GTlsWo3YqtiFoEdMSGRivRKXlRSXSQ9NqP7yrR/GdtEuz0z88bXjABwVca pLTCdzCSKh9PCjC/CJmXP6yY0cZtTzXH1vawTA5LDwGMjidkjaHO/oIkfgF2Zs6SrRMX EK1OfeLJNiFRSgKBwD1/pdidaLbj3w1AL5xWeGATux16r3uz8d65HLEY1Z7MZaw6JRzO OpULcY3GlXVPhSNvNHr8jLzXLgBzeU3o2A81pbjuB7zoRfCpvJ1sQ9T0QRtgQC+4I7H7 dGWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=7iFTUJsLiTosI2lpr0+Egb0ZQgU5bhsD9sbZJQn3TxE=; b=SrtwMwwhbbz34mR7dCNHqRtkM6SIIWZb5k+tulA4rOZU/4G82FaI06raPAesS/E2ZM JnNQwWR+fxdqE6XfLsLQ+5zQ7yP0E8JUOobOZBXMyxEFZXUU/8bFajJqvU+KsweSGvPK Xh7wrR6PKQ12o/qxfM9TMeav6BmEJOTP2oZC/YrzUojkB38rwtPG0ZqzGSy4r9O1zKSf XD8b1PwK76Ct4JQ9jg+0JwD2MeqOlZdlwZki5eveCbMzlFZM65FDuSuw/cAYLg4JYwYQ A/Sm/xEbs0AJi3pBogqkl+fA8rxWdrx+gCJzgc+J4tpYhOHV231cAx+iN+hA05pHgzDa 0Kgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x14-20020a63170e000000b0053476581befsi586862pgl.328.2023.05.31.01.37.04; Wed, 31 May 2023 01:37:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235149AbjEaIQx (ORCPT + 99 others); Wed, 31 May 2023 04:16:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235146AbjEaIQu (ORCPT ); Wed, 31 May 2023 04:16:50 -0400 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03ECC93 for ; Wed, 31 May 2023 01:16:48 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R931e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0Vjwqwcr_1685521005; Received: from 30.221.149.27(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vjwqwcr_1685521005) by smtp.aliyun-inc.com; Wed, 31 May 2023 16:16:46 +0800 Message-ID: Date: Wed, 31 May 2023 16:16:43 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v4 4/5] erofs: unify inline/share xattr iterators for listxattr/getxattr Content-Language: en-US To: Gao Xiang , xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org References: <20230531031330.3504-1-jefflexu@linux.alibaba.com> <20230531031330.3504-5-jefflexu@linux.alibaba.com> <349a1523-6d1c-9e96-d948-78dd4f2a209d@linux.alibaba.com> From: Jingbo Xu In-Reply-To: <349a1523-6d1c-9e96-d948-78dd4f2a209d@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/31/23 2:57 PM, Gao Xiang wrote: > > > On 2023/5/31 11:13, Jingbo Xu wrote: >>   -static int inline_xattr_iter_begin(struct erofs_xattr_iter *it, >> -                   struct inode *inode) >> -{ >> -    struct erofs_inode *const vi = EROFS_I(inode); >> -    unsigned int xattr_header_sz, inline_xattr_ofs; >> - >> -    xattr_header_sz = sizeof(struct erofs_xattr_ibody_header) + >> -              sizeof(u32) * vi->xattr_shared_count; >> -    if (xattr_header_sz >= vi->xattr_isize) { >> -        DBG_BUGON(xattr_header_sz > vi->xattr_isize); >> -        return -ENOATTR; >> -    } In the original implementation, here when xattr_header_sz >= vi->xattr_isize, inline_xattr_iter_begin() will return -ENOATTR rather than a negative integer (i.e. vi->xattr_isize - xattr_header_sz). >>   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) >> @@ -542,45 +432,98 @@ static const struct xattr_iter_handlers >> list_xattr_handlers = { >>       .value = NULL >>   }; >>   -static int inline_listxattr(struct erofs_xattr_iter *it) >> +static int erofs_iter_inline_xattr(struct erofs_xattr_iter *it, >> +                   struct inode *inode, bool getxattr) >>   { >> +    struct erofs_inode *const vi = EROFS_I(inode); >> +    const struct xattr_iter_handlers *op; >> +    unsigned int xattr_header_sz, remaining; >> +    erofs_off_t pos; >>       int ret; >> -    unsigned int remaining; >>   -    ret = inline_xattr_iter_begin(it, d_inode(it->dentry)); > > In the past, "ret" here is "an int", and >     vi->xattr_isize - xattr_header_sz < 0 will return > negative value (although I think that value is problematic). > > see below. See comment above. > > >> -    if (ret < 0) >> -        return ret; >> +    xattr_header_sz = sizeof(struct erofs_xattr_ibody_header) + >> +              sizeof(u32) * vi->xattr_shared_count; >> +    if (xattr_header_sz >= vi->xattr_isize) { >> +        DBG_BUGON(xattr_header_sz > vi->xattr_isize); >> +        return -ENOATTR; >> +    } This checking for "xattr_header_sz >= vi->xattr_isize" is also included in this patch. -- Thanks, Jingbo