From patchwork Thu May 18 02:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 95627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp201094vqo; Wed, 17 May 2023 19:58:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5PcclIRZDF4PTO6nikfLsAGw1Lyj9wQKrfQWFdhpmc0/XAzrRZd1/oe6GgvsAFqdQ/490x X-Received: by 2002:a17:90a:748e:b0:253:45e5:af5c with SMTP id p14-20020a17090a748e00b0025345e5af5cmr1007748pjk.32.1684378703986; Wed, 17 May 2023 19:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684378703; cv=none; d=google.com; s=arc-20160816; b=oeROziryvrzNQUuZzP8XMC1lJV0KITtVQMWCzdSURY070wh7uVFFnUnJzk96Ptw6ct 8iRitX9b2vpdO/rgdWrQhzjC13ot/t3RL+pM+q6NnVPW5dDOsVGAsdk6mAVWIScd0/pN izq77A+NlMF9Gz+ac+jV5ZQ5pXVml0ikoLxdj0McP+eGoKYSN0/RkrZXg0xYS5Z2BuRs O4sVcv84IBwnH0vcsr8Y8URX8n4+GIHWTq6vw7u1VdCJVVB9qwpr0NHmsPh2MFaohRTW yzQuBznXS4+9VSrocwx4L4Yw5vH9tT7LKVbvWn6G6lpLI0hwSSZlfdYJcn/QpAgJD10A XZkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=oLxWpe4cmgFlfDssPfMvT2EYSgt6EJiYkTTWPbJjlT8=; b=oVMwDaf96hJ0cJ5kTPVF+QrjPmtRUunldwNnVcYZFVfKweDkOqW88pe1zvgI1JIWLA 6HVUym5YB1SvTkE9/NM9cfowP7ALDKODZDpkvqliMDPbcCiM9WUAT0+9MNw/tgKIZyLf DTa8u/VzPzJjbT0m2VushNpVSEMOzsEmaYihzQrNWs41daEapo+IWkP7VEUkLzZ/ay/I kenL9jqSGtOouZNeauLNjd0C+VCnw9qaLewj2GmUYKKhATVZkmqd+hsxkp+s+bbNdhcV WVQoKz1xWu0UUR8MYS7bB61M5nwFhpXRsXYnbzl1GqnJ116NSjf5OlClrf8OnRwYt78h p5Cg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z128-20020a633386000000b0051322a8d2aesi347441pgz.110.2023.05.17.19.58.11; Wed, 17 May 2023 19:58:23 -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 S229602AbjERCqA (ORCPT + 99 others); Wed, 17 May 2023 22:46:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjERCp5 (ORCPT ); Wed, 17 May 2023 22:45:57 -0400 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 630E530EC for ; Wed, 17 May 2023 19:45:56 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R891e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0ViutgWP_1684377952; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0ViutgWP_1684377952) by smtp.aliyun-inc.com; Thu, 18 May 2023 10:45:53 +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 v3 1/5] erofs: introduce erofs_xattr_iter_fixup_aligned() helper Date: Thu, 18 May 2023 10:45:47 +0800 Message-Id: <20230518024551.123990-2-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230518024551.123990-1-jefflexu@linux.alibaba.com> References: <20230518024551.123990-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766199084116809623?= X-GMAIL-MSGID: =?utf-8?q?1766199084116809623?= Introduce erofs_xattr_iter_fixup_aligned() helper where it.ofs <= EROFS_BLKSIZ is mandatory. Signed-off-by: Jingbo Xu --- fs/erofs/xattr.c | 79 +++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index bbfe7ce170d2..b79be2a556ba 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -29,6 +29,28 @@ struct xattr_iter { unsigned int ofs; }; +static inline int erofs_xattr_iter_fixup(struct xattr_iter *it) +{ + if (it->ofs < it->sb->s_blocksize) + return 0; + + it->blkaddr += erofs_blknr(it->sb, it->ofs); + it->kaddr = erofs_read_metabuf(&it->buf, it->sb, it->blkaddr, EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + it->ofs = erofs_blkoff(it->sb, it->ofs); + return 0; +} + +static inline int erofs_xattr_iter_fixup_aligned(struct xattr_iter *it) +{ + if (it->ofs > it->sb->s_blocksize) { + DBG_BUGON(1); + return -EFSCORRUPTED; + } + return erofs_xattr_iter_fixup(it); +} + static int erofs_init_inode_xattrs(struct inode *inode) { struct erofs_inode *const vi = EROFS_I(inode); @@ -80,6 +102,7 @@ static int erofs_init_inode_xattrs(struct inode *inode) goto out_unlock; } + it.sb = sb; it.buf = __EROFS_BUF_INITIALIZER; it.blkaddr = erofs_blknr(sb, erofs_iloc(inode) + vi->inode_isize); it.ofs = erofs_blkoff(sb, erofs_iloc(inode) + vi->inode_isize); @@ -105,19 +128,11 @@ static int erofs_init_inode_xattrs(struct inode *inode) it.ofs += sizeof(struct erofs_xattr_ibody_header); for (i = 0; i < vi->xattr_shared_count; ++i) { - if (it.ofs >= sb->s_blocksize) { - /* cannot be unaligned */ - DBG_BUGON(it.ofs != sb->s_blocksize); - - it.kaddr = erofs_read_metabuf(&it.buf, sb, ++it.blkaddr, - EROFS_KMAP); - if (IS_ERR(it.kaddr)) { - kfree(vi->xattr_shared_xattrs); - vi->xattr_shared_xattrs = NULL; - ret = PTR_ERR(it.kaddr); - goto out_unlock; - } - it.ofs = 0; + ret = erofs_xattr_iter_fixup_aligned(&it); + if (ret) { + kfree(vi->xattr_shared_xattrs); + vi->xattr_shared_xattrs = NULL; + goto out_unlock; } vi->xattr_shared_xattrs[i] = le32_to_cpu(*(__le32 *)(it.kaddr + it.ofs)); @@ -150,20 +165,6 @@ struct xattr_iter_handlers { unsigned int len); }; -static inline int xattr_iter_fixup(struct xattr_iter *it) -{ - if (it->ofs < it->sb->s_blocksize) - return 0; - - it->blkaddr += erofs_blknr(it->sb, it->ofs); - it->kaddr = erofs_read_metabuf(&it->buf, it->sb, it->blkaddr, - EROFS_KMAP); - if (IS_ERR(it->kaddr)) - return PTR_ERR(it->kaddr); - it->ofs = erofs_blkoff(it->sb, it->ofs); - return 0; -} - static int inline_xattr_iter_begin(struct xattr_iter *it, struct inode *inode) { @@ -201,7 +202,7 @@ static int xattr_foreach(struct xattr_iter *it, int err; /* 0. fixup blkaddr, ofs, ipage */ - err = xattr_iter_fixup(it); + err = erofs_xattr_iter_fixup(it); if (err) return err; @@ -236,14 +237,9 @@ static int xattr_foreach(struct xattr_iter *it, processed = 0; while (processed < entry.e_name_len) { - if (it->ofs >= it->sb->s_blocksize) { - DBG_BUGON(it->ofs > it->sb->s_blocksize); - - err = xattr_iter_fixup(it); - if (err) - goto out; - it->ofs = 0; - } + err = erofs_xattr_iter_fixup_aligned(it); + if (err) + goto out; slice = min_t(unsigned int, it->sb->s_blocksize - it->ofs, entry.e_name_len - processed); @@ -271,14 +267,9 @@ static int xattr_foreach(struct xattr_iter *it, } while (processed < value_sz) { - if (it->ofs >= it->sb->s_blocksize) { - DBG_BUGON(it->ofs > it->sb->s_blocksize); - - err = xattr_iter_fixup(it); - if (err) - goto out; - it->ofs = 0; - } + err = erofs_xattr_iter_fixup_aligned(it); + if (err) + goto out; slice = min_t(unsigned int, it->sb->s_blocksize - it->ofs, value_sz - processed);