From nobody Tue Apr 28 10:33:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39815C433FE for ; Wed, 1 Jun 2022 12:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244672AbiFAMXd (ORCPT ); Wed, 1 Jun 2022 08:23:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235345AbiFAMX0 (ORCPT ); Wed, 1 Jun 2022 08:23:26 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 185063B3C9 for ; Wed, 1 Jun 2022 05:23:25 -0700 (PDT) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LCpD73fdjzgYWl; Wed, 1 Jun 2022 20:21:43 +0800 (CST) Received: from dggpemm500002.china.huawei.com (7.185.36.229) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:23 +0800 Received: from localhost.localdomain (10.175.112.125) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:22 +0800 From: Chen Wandun To: , , , CC: Subject: [PATCH 1/4] mm/shmem: check return value of shmem_init_inodecache Date: Wed, 1 Jun 2022 20:44:14 +0800 Message-ID: <20220601124417.2872001-2-chenwandun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601124417.2872001-1-chenwandun@huawei.com> References: <20220601124417.2872001-1-chenwandun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It will result in null pointer access if shmem_init_inodecache fail, so check return value of shmem_init_inodecache Signed-off-by: Chen Wandun --- mm/shmem.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index d55dd972023a..80c361c3d82c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3776,11 +3776,13 @@ static void shmem_init_inode(void *foo) inode_init_once(&info->vfs_inode); } =20 -static void shmem_init_inodecache(void) +static struct kmem_cache *shmem_init_inodecache(void) { shmem_inode_cachep =3D kmem_cache_create("shmem_inode_cache", sizeof(struct shmem_inode_info), 0, SLAB_PANIC|SLAB_ACCOUNT, shmem_init_inode); + + return shmem_inode_cachep; } =20 static void shmem_destroy_inodecache(void) @@ -3924,7 +3926,10 @@ void __init shmem_init(void) { int error; =20 - shmem_init_inodecache(); + if (!shmem_init_inodecache()) { + error =3D -ENOMEM; + goto out2; + } =20 error =3D register_filesystem(&shmem_fs_type); if (error) { --=20 2.25.1 From nobody Tue Apr 28 10:33:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F6DCC433F5 for ; Wed, 1 Jun 2022 12:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350120AbiFAMXj (ORCPT ); Wed, 1 Jun 2022 08:23:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240765AbiFAMX1 (ORCPT ); Wed, 1 Jun 2022 08:23:27 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84FD53B571 for ; Wed, 1 Jun 2022 05:23:26 -0700 (PDT) Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4LCpFs2319zDqWt; Wed, 1 Jun 2022 20:23:13 +0800 (CST) Received: from dggpemm500002.china.huawei.com (7.185.36.229) by dggpemm500020.china.huawei.com (7.185.36.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:24 +0800 Received: from localhost.localdomain (10.175.112.125) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:24 +0800 From: Chen Wandun To: , , , CC: Subject: [PATCH 2/4] mm/shmem: return -EINVAL for addr not PAGE_SIZE aligned Date: Wed, 1 Jun 2022 20:44:15 +0800 Message-ID: <20220601124417.2872001-3-chenwandun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601124417.2872001-1-chenwandun@huawei.com> References: <20220601124417.2872001-1-chenwandun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If addr is not PAGE_SIZE aligned, return -EINVAL directly. Besides, use macro offset_in_page to check addr is not PAGE_SIZE aligned case. Signed-off-by: Chen Wandun --- mm/shmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 80c361c3d82c..1136dd7da9e5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2143,8 +2143,8 @@ unsigned long shmem_get_unmapped_area(struct file *fi= le, return addr; if (IS_ERR_VALUE(addr)) return addr; - if (addr & ~PAGE_MASK) - return addr; + if (offset_in_page(addr)) + return -EINVAL; if (addr > TASK_SIZE - len) return addr; =20 @@ -2197,7 +2197,7 @@ unsigned long shmem_get_unmapped_area(struct file *fi= le, inflated_addr =3D get_area(NULL, uaddr, inflated_len, 0, flags); if (IS_ERR_VALUE(inflated_addr)) return addr; - if (inflated_addr & ~PAGE_MASK) + if (offset_in_page(inflated_addr)) return addr; =20 inflated_offset =3D inflated_addr & (HPAGE_PMD_SIZE-1); --=20 2.25.1 From nobody Tue Apr 28 10:33:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EC8CC433F5 for ; Wed, 1 Jun 2022 12:23:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239274AbiFAMXg (ORCPT ); Wed, 1 Jun 2022 08:23:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241237AbiFAMX1 (ORCPT ); Wed, 1 Jun 2022 08:23:27 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 265FA3A71C for ; Wed, 1 Jun 2022 05:23:27 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LCpF718ZWzjXHt; Wed, 1 Jun 2022 20:22:35 +0800 (CST) Received: from dggpemm500002.china.huawei.com (7.185.36.229) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:25 +0800 Received: from localhost.localdomain (10.175.112.125) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:25 +0800 From: Chen Wandun To: , , , CC: Subject: [PATCH 3/4] mm/shmem: return error code directly Date: Wed, 1 Jun 2022 20:44:16 +0800 Message-ID: <20220601124417.2872001-4-chenwandun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601124417.2872001-1-chenwandun@huawei.com> References: <20220601124417.2872001-1-chenwandun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If [addr, addr + len) beyond TASK_SIZE, return error code directly. No need to check this case in caller. Signed-off-by: Chen Wandun --- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 1136dd7da9e5..ca04f3975a8a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2146,7 +2146,7 @@ unsigned long shmem_get_unmapped_area(struct file *fi= le, if (offset_in_page(addr)) return -EINVAL; if (addr > TASK_SIZE - len) - return addr; + return -ENOMEM; =20 if (shmem_huge =3D=3D SHMEM_HUGE_DENY) return addr; --=20 2.25.1 From nobody Tue Apr 28 10:33:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 192E8C433F5 for ; Wed, 1 Jun 2022 12:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231854AbiFAMXn (ORCPT ); Wed, 1 Jun 2022 08:23:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346708AbiFAMXb (ORCPT ); Wed, 1 Jun 2022 08:23:31 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2783A3B3E2 for ; Wed, 1 Jun 2022 05:23:28 -0700 (PDT) Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4LCpDC2Bw4z1K9BD; Wed, 1 Jun 2022 20:21:47 +0800 (CST) Received: from dggpemm500002.china.huawei.com (7.185.36.229) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:27 +0800 Received: from localhost.localdomain (10.175.112.125) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 20:23:26 +0800 From: Chen Wandun To: , , , CC: Subject: [PATCH 4/4] mm/shmem: rework calculation of inflated_addr in shmem_get_unmapped_area Date: Wed, 1 Jun 2022 20:44:17 +0800 Message-ID: <20220601124417.2872001-5-chenwandun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601124417.2872001-1-chenwandun@huawei.com> References: <20220601124417.2872001-1-chenwandun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In function shmem_get_unmapped_area, inflated_offset and offset are unsigned long, it will result in underflow when offset below inflated_offset, a little confusing, no functional change. Signed-off-by: Chen Wandun --- mm/shmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index ca04f3975a8a..f12163bd0f69 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2201,9 +2201,12 @@ unsigned long shmem_get_unmapped_area(struct file *f= ile, return addr; =20 inflated_offset =3D inflated_addr & (HPAGE_PMD_SIZE-1); - inflated_addr +=3D offset - inflated_offset; - if (inflated_offset > offset) + if (offset > inflated_offset) + inflated_addr +=3D offset - inflated_offset; + else if (offset < inflated_offset) { + inflated_addr -=3D inflated_offset - offset; inflated_addr +=3D HPAGE_PMD_SIZE; + } =20 if (inflated_addr > TASK_SIZE - len) return addr; --=20 2.25.1