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 5F878C3ABDD for ; Fri, 16 May 2025 08:15:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27B9E6B00F7; Fri, 16 May 2025 04:15:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E54F6B00F5; Fri, 16 May 2025 04:15:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3B156B00F7; Fri, 16 May 2025 04:15:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 94EFB6B00F2 for ; Fri, 16 May 2025 04:15:34 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 48DD514193D for ; Fri, 16 May 2025 08:15:35 +0000 (UTC) X-FDA: 83448061830.08.91CF5F2 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf09.hostedemail.com (Postfix) with ESMTP id CB88B14000A for ; Fri, 16 May 2025 08:15:32 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747383333; 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=RUhFv4SqxEyMafATVJFUHqRRl4ECEhu2BZQThLnK/0zGXOm1cJxsVXw+6hY1fQ89a5kVmC rhhfX3Pni9704TwY91Dr6gRQ5ZBTTOd8TUUHnQ3bjl2peun0Km6IxIRbYzXRAQu2DKpIyC nN/c4ZZ7/VwkvCU5TSIah7yUuHKzjBI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747383333; a=rsa-sha256; cv=none; b=H6Pkiu0vI1BG4kVreYCq+1rVhKoiJc3L4EyVrZrbaoVJe1lSLBCy/S6+/JAsVd5xIQqp/l zqkvbG3c01xt5+NIVpYBqQp5J/lYT156pvEnvdO+rALi0d9FOi8/rJ422/rwkrC79DyESI Ym6V/mRPB5NpcdfjpR6LMAOs7bG63LU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4ZzKdY3bgnzYQv5X for ; Fri, 16 May 2025 16:15:29 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id BAEB21A18BE for ; Fri, 16 May 2025 16:15:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP3 (Coremail) with SMTP id _Ch0CgDnOsUe9CZo9fSDMQ--.49450S4; Fri, 16 May 2025 16:15:28 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, akpm@linux-foundation.org Cc: ryncsn@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] mm: shmem: add missing shmem_unacct_size() in __shmem_file_setup() Date: Sat, 17 May 2025 01:09:36 +0800 Message-Id: <20250516170939.965736-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250516170939.965736-1-shikemeng@huaweicloud.com> References: <20250516170939.965736-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_Ch0CgDnOsUe9CZo9fSDMQ--.49450S4 X-Coremail-Antispam: 1UD129KBjvdXoW7GrW3JrWDtw4rZF4xAr1UKFg_yoWDZrcEk3 y8Jr4rGFsxXrnxXF4jka92gryfXFWqyFZxWryfK343ZF1DtrykGFZ5ZrZIgry7Z3WFqas8 Aw18ZrsIgF429jkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7AKxV WUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j9739U UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: zxpf8zp7negmhwenruoojnpsm4sgifz3 X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: CB88B14000A X-HE-Tag: 1747383332-867638 X-HE-Meta: U2FsdGVkX1967s0ksFhdPaFMjbD66CMMvbj79R/5PAExOXtomSzjghgUv0VnSfbC1aYzWirtf8wyl5yMKM4EReXLtwKY+b2nbIhDT4DdTtuud/QsLNp5+FoSg5Y7Ru7bNB86MXcRStfJCzX0K/k2ZY1+12HRsKEUyaCnbBP0ZDNGAB15lg+V8s3cRh48e6H5MjHb9IE9G/DTxGf49igqiq7QmVKg5PScqHmH5O1bTEtCMf2F1AaiNnGF238D7CYjp/ZRScHjQq7s4cLpdH0fTc197qP0JByz+V2flercSdOiRAHPZbi9U8dY6cVo88onUUtucgIbzevWmNublXrWRzW7Astvc1HlJDyUNaUnG3PMk+jzuAzi0mHEYNg8ZFTpq7EYIG4rz2dxbT5vROqBIHLe7cgKiDkJchM6O1837Gbb1Hj4PC1kgGm7Xs+/KApGNdeklNhXt+R3zkXopqOoaS6t4jU57jaEYR2xax72o7qtZyHe89LABCVbjNpVWIKVCS2nmWmG+SUqkZ6vwX93cplOAATh6ecIXMiTHE2qpDHdDxr9pS3NFXfyN9BlNi9w/tQTrigsBK4dgBE/4a43EWOwlf2s6sJ/Mlw7EIy8c2gv9fGy5KfkBQTRt82E214/E9g1NBZE0FVwumHi1oXLI9L8+x+Csh/gl0Nr2SobfB8dsHgxQMOxO22ynj9CUA6gIGmxD0XQLZDcPCs4tKGTy38gcLb49peqcGEFbRTkEVH97S5GTrCe7hhkugrPYYAWaj6XbFsLrLxvvTWkpFBdvhW3jFeMBon1awf7yZpbEEVWBU9Nk0nqaaWHg5kn6asN4WPIBtQEBbxYH+VwuO4Wfz23Rgjn6tvnAibQjmnNpoybC5mZtq1zzaojAttajbsopdTkm41XVC1RGJF5sYbA2fpYDsb3tMxMiCcjmi/P4InDbKqqBDTWAiL1jbA710i8YDz86o2DdeBy4im0GLQ 9AaxNyt+ Q/5/STf/Uo9aR7Hjc7Erv/pezanEdlCiD3DNwoQQJ3xaNLEhJMX+GchDlv29ryy+tpCkascuSjb5JkiVFpslPWpVwDI0LXDvtQLOosBWujlU/CyfeUEMOD6TDpePswSwERHJmpEG4n/d4qPX9hQH1afi2nmpK60jZmFI2nqKsv4jnsgVaV1CIfuCJkxCJtgMow0r+apaJfGi59TfQoaH0PsbRaixV3brTe+nCkd//hDf+JyA= 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