From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC663C3ABD9 for ; Wed, 14 May 2025 07:56:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 993A96B00EE; Wed, 14 May 2025 03:56:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 697F46B00EB; Wed, 14 May 2025 03:56:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEF626B00EF; Wed, 14 May 2025 03:56:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3FF226B00EB for ; Wed, 14 May 2025 03:56:41 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B9735E1BED for ; Wed, 14 May 2025 07:56:41 +0000 (UTC) X-FDA: 83440756602.05.EFBA7F7 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf18.hostedemail.com (Postfix) with ESMTP id 93B901C0007 for ; Wed, 14 May 2025 07:56:37 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747209400; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eq+BRmyebId3sgWnJuMEbpViF3JykO+jNg24KeeivFY=; b=zWssMYePGQ+nHFXJ5vC/mcmOpCzNjRfDqtUIdhRwFU4mgHiNh82TbaDcvM20AxEfXCOsEz JT464K9lJDBd482cAYrdtUHolMQZ7yr/SDLkO7tSsHKg2w81zITLnAkB3rYyombsv3QIw0 KSgwoTBhGHeX20Fq8vgnmFTFGIqKBLc= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747209400; a=rsa-sha256; cv=none; b=f/YmOjYVAQ058lAufDZTs8giY2W4DBVRPtg6qqaPSsjPcRTRY69Csn7udx0EyZWI0gEq3M GdpflJob7R9JXlTZMcyzgfDO31b5HQUTuBbc0lA+PwSlgrXlOrmZZGyV0SEea+illSS8fB i9WAJ3AHNQMLoK2fSTyPOaXgomqLQik= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Zy5J83Kjmz4f3jd6 for ; Wed, 14 May 2025 15:56:08 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 3C8E01A0BE2 for ; Wed, 14 May 2025 15:56:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgDXOnuvTCRoTNWvMA--.62928S4; Wed, 14 May 2025 15:56:33 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] mm: shmem: add missing shmem_unacct_size() in __shmem_file_setup() Date: Thu, 15 May 2025 00:50:44 +0800 Message-Id: <20250514165047.946884-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250514165047.946884-1-shikemeng@huaweicloud.com> References: <20250514165047.946884-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDXOnuvTCRoTNWvMA--.62928S4 X-Coremail-Antispam: 1UD129KBjvdXoW7GrW3JrWDtw4rZF4xAr1UKFg_yoWDJwbEk3 yrJr4rGFsxXrnxXF4jka92qryfXFWqyF9xWryfK347ZF1Dtr1kGF4kZrZIgry7X3WFqas8 Aw18ZrsFgF429jkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7AKxV WUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jhxhLU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: y11mufx4runo6cgn14s4tc4cgnbb51py X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 93B901C0007 X-HE-Tag: 1747209397-24940 X-HE-Meta: U2FsdGVkX1/sx1RVqLa1w82EAo5EyNoaZ2Kk0pn4CJAX1Pqovc3t3BLmvrB0Hmkc5kgKkjwghVt1tyhhdPWNjWFnd7ovsCyAOOf2cMLoz7PwFJd2IDbfG37NQ5u/vd97p+tel0GncU1T0DU9hnItWUAHHvmBNSMdzKbgL795I3ILZwJtau3PTJRqCo4iCtw4d04AVTlR4caVFUYO43KvGCb/lMAXNthXyO+zOkrwuNVWv+5/4rrm9tSwB6RnFGkLTS5mLHGfESHi8ok8UHpzM9aBaR6vvNv07zRfbD1oGU6o292MVTY3S+z8v2qNtCvEU/m9l5V8MPzVftzpAacs/hneNEdIFCQGr84WegKCEAO5y/ZWriKPVCwnY+xCpUsbP1EpmJY0wMK/gD62equXcsqJuBmVtBJciJXF5CLd1CgqyEn//aeo6irZXX1WV3M4tfHw9yLQIfc0m/VgZgTcJYUjEBPIWU5V1/RBn1ENUQVtc2OGSBOvqHZ4X4XH9jBEfmiYiDWEB2k4Kt3u1lKS81K+ayJYUpVCWNWcRsHX6JAhXgT4w113rSismCyYsvoMuUH3RJOKJ7O6nTuZ+6V/ldBS7Kxe2s5mUiPf3ix5oOB8w4zwxbY9Il7Qv2Z6hSDtTHJ5oCbOReg6MHeLxRi1F8UROoO48Uwy8oh0RESSEkN+xNnFua25SdwEv3HCJbtwYuYyVPTA6MpjzJ2YM6LRx2hBoWKT8V8ILm11Nced2LkHcD35thvp9XbK4wQEnitWp4jmGt/NQvPFxoZ37aP2BL/SS+hKIQW3WxqOiE1ckWTdUDN2hvE7VcsN68LieZkyt01zzZr4QsSmFoCFm/nBfDJb89RjNw6KHk3n6M2Pg3Dv/4S59X3HkiRf6Fb/r2YPPH6j/Rto8ksgSI+8DGrMkfxCK7cKTsnmdZgmTigk4BK3mvdLXrBxAkr03+sUU8zG6ZliwEY9Ki6IwX+yvrZ zcJnWRyH jd3MuTeH+MfenbLQBbhNIrH8z0UzbWMDnHGwBykOM/5DhkCHVnV40qMsRPrmb0Z1W9p71cY5l88yitcYoeSlOKrUt8Ue1QwWfAdtPtvnLOayHt53BWnIOJe4UgTLENwvWeoINk/bl7FK9MhkLE2+4fNZHD+p6iurReDnczgzeGJXEoilCIFtHS0hskWIStqMhgiES1p3/gEERC0x6enhmdTMioA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We will miss shmem_unacct_size() when is_idmapped_mnt() returns a failure. Move is_idmapped_mnt() before shmem_acct_size() to fix the issue. Fixes: 7a80e5b8c6fa7 ("shmem: support idmapped mounts for tmpfs") Signed-off-by: Kemeng Shi --- mm/shmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 980fa15f393e..495e661eb8bb 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -5812,12 +5812,12 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, if (size < 0 || size > MAX_LFS_FILESIZE) return ERR_PTR(-EINVAL); - if (shmem_acct_size(flags, size)) - return ERR_PTR(-ENOMEM); - if (is_idmapped_mnt(mnt)) return ERR_PTR(-EINVAL); + if (shmem_acct_size(flags, size)) + return ERR_PTR(-ENOMEM); + inode = shmem_get_inode(&nop_mnt_idmap, mnt->mnt_sb, NULL, S_IFREG | S_IRWXUGO, 0, flags); if (IS_ERR(inode)) { -- 2.30.0