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 E8721C54754 for ; Thu, 15 May 2025 06:54:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8D6D6B00DC; Thu, 15 May 2025 02:53:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54EF96B0101; Thu, 15 May 2025 02:53:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 189156B00D6; Thu, 15 May 2025 02:53:54 -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 999FC6B00FE for ; Thu, 15 May 2025 02:53:54 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 79A4ABECB9 for ; Thu, 15 May 2025 06:53:54 +0000 (UTC) X-FDA: 83444227188.19.9551A8F Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf11.hostedemail.com (Postfix) with ESMTP id D03F840009 for ; Thu, 15 May 2025 06:53:50 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=1747292032; 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=r3UAwwhmx+pfJtqXAHiEX23n2jHBo4m//wn/Hj7aJgw=; b=0Mi6eD7O/dDOEhK7JnaDPlYUWId1QoPOBGCgHpEq9xnr0OXxljFKQPmUOsMg8+FpOEXSvr qVtrmwcwQRVvr92j9WJ41UTW1bDhf1vIm39W8s86AKI9Vsd5dctFdlzoP1/gUg9CrWUjNy r5KH2Ql4liGK7PmSZduqRz5pOjyKxeY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747292032; a=rsa-sha256; cv=none; b=0f+E6cG6dTxlwiBrf1Ie7QYpkCyIAGK2WpKBFHwbWu4AmxGTSKSE4wzV/6EBccDmBW4JSW IUrT/F9x7qpszLMx3SYpAqnrdyoXWkFTL0jYfB67avONafZFaQiUh/KQ94Zl+EjFq1Qat6 ZUiNcm5eHzmWGKdGI+PH7BZgGYmuR4M= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZygsL3Mvpz4f3jtW for ; Thu, 15 May 2025 14:53:26 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 179141A1410 for ; Thu, 15 May 2025 14:53:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP4 (Coremail) with SMTP id gCh0CgAHbGB3jyVoyDnbMQ--.29023S4; Thu, 15 May 2025 14:53:45 +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 v2 2/5] mm: shmem: add missing shmem_unacct_size() in __shmem_file_setup() Date: Thu, 15 May 2025 23:47:55 +0800 Message-Id: <20250515154758.956521-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250515154758.956521-1-shikemeng@huaweicloud.com> References: <20250515154758.956521-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgAHbGB3jyVoyDnbMQ--.29023S4 X-Coremail-Antispam: 1UD129KBjvdXoW7GrW3JrWDtw4rZF4xAr1UKFg_yoWDZrcEk3 y8Jr4rGFsxXrnxXF4jka92gryfXFWqyFZxWryfK343ZF1DtrykGFZ5ZrZIgry7Z3WFqas8 Aw18ZrsIgF429jkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-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-Rspam-User: X-Rspamd-Queue-Id: D03F840009 X-Rspamd-Server: rspam09 X-Stat-Signature: s3afmdz859a4ijcb5cfacja86pkgjyxm X-HE-Tag: 1747292030-93135 X-HE-Meta: U2FsdGVkX19gN7BXsGLVWs3HtR4cbgWK2lpfd1DkS95715qE7vpoYJ7VHQuYEFxsmVUmw3arc9T5uXjdwNNpZf95BpC8auzJXhfVPedlDUeR8/LalDx3S7XkkJ3biUOInGDdtamsy+BfRlTPqkDTrMRky1G4qJ9agMv9sWpoA0AomOsEK6QHPrqwcTK+fW7FiEnkUe2SIYI3nBEoeamUUiQbTJ3rn4y6g28tOQkJwSBS7a7Z9yE6GpEDPYnD75igqJtuIZwTJzdk88C+2na5d6qO1/EY3pBbeu2zOlRc5NToJNMRK+uAtcdR6xi4k0clePNjaNAnTKEagTvZBUQggWfzME/162eftflfbkC4FSLt+6fzKy4e7N+QAJJN8HPyrLqW9yeCnZGWC/D9k3L6uyok0HYJObYtwtbhX5CdTUeZg0g7HFWbRdi2tJ4iGTFVLJeFkJ/PqshhSq4FFVk8McVURCQ5FibTtKnPyQ+iYP5qsyn7BT6EuFoeNv6umGaLkHjvoomU7PDDk+yzDpUIFxpouo8lEVjHgiQDUbewXY9Fwvny/mwkunSePwo/BeM6E7vDUTBUP50VnixhlNzQV5mE2t7w382fHTwx7O0wp1tvhTPH4eOy9pSNXFkAAgZc1L3yJ2EJjGYeN/ei7F17oGoXAmediYvS5HPuvqGHFt1HH9Hr4bO6kIU9MVsG8g2PwusjN6sLi7I6CdkWKVaQ8xdzW1kfctiBZbkf4PESKAupdsaGcx/MNjUkp7zW4uNE64Wqk7/SCDsoCkkdoI2zvDTtpX138hzzbxy2JhvPnYzcMniOuxlC16W6n3W9zZm0nYNEW8Ejgbwsu6Op2jhpjfAwj/g/4Qxww8FZSrC6/nVtparQNjfnuB3nMewhr4hl/D0bYIq6+IPJ/swoAjzBAXWTur/curfniTDl5UIAhsNbfCgq1Hr5LyJzrUm0i58cD+767H5nBra3dh9ikUv 7E6pTJQA RNp0+RNi1yt6Dqtk8cXXU1OjdjPHoo1jBcYMPaKoqAdmX0WmZZWYFlFyo/bkzxjwN48QztIKisfsFl/IgALTdPTeL+zZGqj3KRMpuuPTQ3tFE0SEOv7qMRp9PXylm17b5PCr4TfbE3vI5eVtQVh2SP01TdUYq5LIoCVsNyVUFd9+kFZBD9xMVm6TyTn3yTgonvuzAUPxFhIOjBFZrqXeiRLXxGThFbcoPOlHNP4VMbPg6i1w= 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 Reviewed-by: Baolin Wang --- 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