From nobody Mon Sep 15 02:14:06 2025 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 342F5C54EBE for ; Mon, 16 Jan 2023 11:59:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230211AbjAPL7O (ORCPT ); Mon, 16 Jan 2023 06:59:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230325AbjAPL7A (ORCPT ); Mon, 16 Jan 2023 06:59:00 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5753A19684 for ; Mon, 16 Jan 2023 03:58:58 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NwVr24brBzRrlv; Mon, 16 Jan 2023 19:57:06 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500014.china.huawei.com (7.185.36.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 16 Jan 2023 19:58:55 +0800 From: Wupeng Ma To: CC: , , , , Subject: [PATCH v2 1/4] mm/mlock: return EINVAL if len overflows for mlock/munlock Date: Mon, 16 Jan 2023 19:58:10 +0800 Message-ID: <20230116115813.2956935-2-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230116115813.2956935-1-mawupeng1@huawei.com> References: <20230116115813.2956935-1-mawupeng1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500014.china.huawei.com (7.185.36.153) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ma Wupeng While testing mlock, we have a problem if the len of mlock is ULONG_MAX. The return value of mlock is zero. But nothing will be locked since the len in do_mlock overflows to zero due to the following code in mlock: len =3D PAGE_ALIGN(len + (offset_in_page(start))); The same problem happens in munlock. Add new check and return -EINVAL to fix this overflowing scenarios since they are absolutely wrong. Signed-off-by: Ma Wupeng --- mm/mlock.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/mlock.c b/mm/mlock.c index 7032f6dd0ce1..5a4e767feb28 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -569,6 +569,7 @@ static __must_check int do_mlock(unsigned long start, s= ize_t len, vm_flags_t fla unsigned long locked; unsigned long lock_limit; int error =3D -ENOMEM; + size_t old_len =3D len; =20 start =3D untagged_addr(start); =20 @@ -578,6 +579,9 @@ static __must_check int do_mlock(unsigned long start, s= ize_t len, vm_flags_t fla len =3D PAGE_ALIGN(len + (offset_in_page(start))); start &=3D PAGE_MASK; =20 + if (old_len !=3D 0 && len =3D=3D 0) + return -EINVAL; + lock_limit =3D rlimit(RLIMIT_MEMLOCK); lock_limit >>=3D PAGE_SHIFT; locked =3D len >> PAGE_SHIFT; @@ -632,12 +636,16 @@ SYSCALL_DEFINE3(mlock2, unsigned long, start, size_t,= len, int, flags) SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) { int ret; + size_t old_len =3D len; =20 start =3D untagged_addr(start); =20 len =3D PAGE_ALIGN(len + (offset_in_page(start))); start &=3D PAGE_MASK; =20 + if (old_len !=3D 0 && len =3D=3D 0) + return -EINVAL; + if (mmap_write_lock_killable(current->mm)) return -EINTR; ret =3D apply_vma_lock_flags(start, len, 0); --=20 2.25.1 From nobody Mon Sep 15 02:14:06 2025 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 18843C54EBE for ; Mon, 16 Jan 2023 11:59:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230215AbjAPL71 (ORCPT ); Mon, 16 Jan 2023 06:59:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230326AbjAPL7A (ORCPT ); Mon, 16 Jan 2023 06:59:00 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4829C196A9 for ; Mon, 16 Jan 2023 03:58:59 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NwVmX4qkRzqVbL; Mon, 16 Jan 2023 19:54:04 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500014.china.huawei.com (7.185.36.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 16 Jan 2023 19:58:56 +0800 From: Wupeng Ma To: CC: , , , , Subject: [PATCH v2 2/4] mm/mempolicy: return EINVAL for if len overflows for set_mempolicy_home_node Date: Mon, 16 Jan 2023 19:58:11 +0800 Message-ID: <20230116115813.2956935-3-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230116115813.2956935-1-mawupeng1@huawei.com> References: <20230116115813.2956935-1-mawupeng1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500014.china.huawei.com (7.185.36.153) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ma Wupeng Return -EINVAL if len overflows for set_mempolicy_home_node. Signed-off-by: Ma Wupeng --- mm/mempolicy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 02c8a712282f..153fda1ebb9c 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1488,6 +1488,7 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned lon= g, start, unsigned long, le unsigned long, home_node, unsigned long, flags) { struct mm_struct *mm =3D current->mm; + unsigned long old_len =3D len; struct vm_area_struct *vma; struct mempolicy *new; unsigned long vmstart; @@ -1515,7 +1516,7 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned lon= g, start, unsigned long, le len =3D PAGE_ALIGN(len); end =3D start + len; =20 - if (end < start) + if (end < start || (old_len !=3D 0 && len =3D=3D 0)) return -EINVAL; if (end =3D=3D start) return 0; --=20 2.25.1 From nobody Mon Sep 15 02:14:06 2025 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 326E3C54EBE for ; Mon, 16 Jan 2023 11:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbjAPL7f (ORCPT ); Mon, 16 Jan 2023 06:59:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbjAPL7F (ORCPT ); Mon, 16 Jan 2023 06:59:05 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F155196A9 for ; Mon, 16 Jan 2023 03:59:04 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NwVr33dTNzRrlw; Mon, 16 Jan 2023 19:57:07 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500014.china.huawei.com (7.185.36.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 16 Jan 2023 19:58:56 +0800 From: Wupeng Ma To: CC: , , , , Subject: [PATCH v2 3/4] mm/mempolicy: return EINVAL if len overflows for mbind Date: Mon, 16 Jan 2023 19:58:12 +0800 Message-ID: <20230116115813.2956935-4-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230116115813.2956935-1-mawupeng1@huawei.com> References: <20230116115813.2956935-1-mawupeng1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500014.china.huawei.com (7.185.36.153) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ma Wupeng Return -EINVAL if len overflows for mbind. Signed-off-by: Ma Wupeng --- mm/mempolicy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 153fda1ebb9c..4cb19a6e368b 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1258,6 +1258,7 @@ static long do_mbind(unsigned long start, unsigned lo= ng len, nodemask_t *nmask, unsigned long flags) { struct mm_struct *mm =3D current->mm; + unsigned long old_len =3D len; struct mempolicy *new; unsigned long end; int err; @@ -1278,7 +1279,7 @@ static long do_mbind(unsigned long start, unsigned lo= ng len, len =3D PAGE_ALIGN(len); end =3D start + len; =20 - if (end < start) + if (end < start || (old_len !=3D 0 && len =3D=3D 0)) return -EINVAL; if (end =3D=3D start) return 0; --=20 2.25.1 From nobody Mon Sep 15 02:14:06 2025 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 57151C46467 for ; Mon, 16 Jan 2023 11:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbjAPL7K (ORCPT ); Mon, 16 Jan 2023 06:59:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230329AbjAPL7B (ORCPT ); Mon, 16 Jan 2023 06:59:01 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B4FF196BF for ; Mon, 16 Jan 2023 03:59:00 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NwVrb20pZzJrvS; Mon, 16 Jan 2023 19:57:35 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500014.china.huawei.com (7.185.36.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 16 Jan 2023 19:58:57 +0800 From: Wupeng Ma To: CC: , , , , Subject: [PATCH v2 4/4] mm/msync: return ENOMEM if len overflows for msync Date: Mon, 16 Jan 2023 19:58:13 +0800 Message-ID: <20230116115813.2956935-5-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230116115813.2956935-1-mawupeng1@huawei.com> References: <20230116115813.2956935-1-mawupeng1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500014.china.huawei.com (7.185.36.153) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ma Wupeng Return -ENOMEM if len overflows for msync. Signed-off-by: Ma Wupeng --- mm/msync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/msync.c b/mm/msync.c index ac4c9bfea2e7..8ac227ec38af 100644 --- a/mm/msync.c +++ b/mm/msync.c @@ -36,6 +36,7 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len,= int, flags) struct vm_area_struct *vma; int unmapped_error =3D 0; int error =3D -EINVAL; + size_t old_len =3D len; =20 start =3D untagged_addr(start); =20 @@ -48,7 +49,7 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len,= int, flags) error =3D -ENOMEM; len =3D (len + ~PAGE_MASK) & PAGE_MASK; end =3D start + len; - if (end < start) + if (end < start || (old_len !=3D 0 && len =3D=3D 0)) goto out; error =3D 0; if (end =3D=3D start) --=20 2.25.1