From nobody Mon Feb 9 01:47: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 D6FFBC7618A for ; Mon, 20 Mar 2023 02:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbjCTCr7 (ORCPT ); Sun, 19 Mar 2023 22:47:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbjCTCrt (ORCPT ); Sun, 19 Mar 2023 22:47:49 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EF6A20692 for ; Sun, 19 Mar 2023 19:47:46 -0700 (PDT) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PfzbY3Q4Fz17MKr; Mon, 20 Mar 2023 10:44:41 +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.2507.21; Mon, 20 Mar 2023 10:47:44 +0800 From: Wupeng Ma To: CC: , , , , , Subject: [PATCH v4 1/4] mm/mlock: return EINVAL if len overflows for mlock/munlock Date: Mon, 20 Mar 2023 10:47:36 +0800 Message-ID: <20230320024739.224850-2-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320024739.224850-1-mawupeng1@huawei.com> References: <20230320024739.224850-1-mawupeng1@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 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 617469fce96d..eb68476da497 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -568,6 +568,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 @@ -577,6 +578,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; @@ -631,12 +635,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 Feb 9 01:47: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 A42B4C7618A for ; Mon, 20 Mar 2023 02:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbjCTCrw (ORCPT ); Sun, 19 Mar 2023 22:47:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbjCTCrt (ORCPT ); Sun, 19 Mar 2023 22:47:49 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A08F92069B for ; Sun, 19 Mar 2023 19:47:46 -0700 (PDT) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PfzbY6VtPz17MLF; Mon, 20 Mar 2023 10:44:41 +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.2507.21; Mon, 20 Mar 2023 10:47:44 +0800 From: Wupeng Ma To: CC: , , , , , Subject: [PATCH v4 2/4] mm/mempolicy: return EINVAL for if len overflows for set_mempolicy_home_node Date: Mon, 20 Mar 2023 10:47:37 +0800 Message-ID: <20230320024739.224850-3-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320024739.224850-1-mawupeng1@huawei.com> References: <20230320024739.224850-1-mawupeng1@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 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 a256a241fd1d..3a68998adc3a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1489,6 +1489,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, *old; unsigned long vmstart; @@ -1516,7 +1517,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 Feb 9 01:47: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 882F3C7618A for ; Mon, 20 Mar 2023 02:47:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229837AbjCTCru (ORCPT ); Sun, 19 Mar 2023 22:47:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbjCTCrs (ORCPT ); Sun, 19 Mar 2023 22:47:48 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CC122069C for ; Sun, 19 Mar 2023 19:47:47 -0700 (PDT) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PfzbZ2WnGz17MLK; Mon, 20 Mar 2023 10:44:42 +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.2507.21; Mon, 20 Mar 2023 10:47:45 +0800 From: Wupeng Ma To: CC: , , , , , Subject: [PATCH v4 3/4] mm/mempolicy: return EINVAL if len overflows for mbind Date: Mon, 20 Mar 2023 10:47:38 +0800 Message-ID: <20230320024739.224850-4-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320024739.224850-1-mawupeng1@huawei.com> References: <20230320024739.224850-1-mawupeng1@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 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 3a68998adc3a..6b1c45021e48 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1259,6 +1259,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; @@ -1279,7 +1280,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 Feb 9 01:47: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 0613DC6FD1F for ; Mon, 20 Mar 2023 02:48:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbjCTCsC (ORCPT ); Sun, 19 Mar 2023 22:48:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbjCTCrt (ORCPT ); Sun, 19 Mar 2023 22:47:49 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 009C0206A3 for ; Sun, 19 Mar 2023 19:47:47 -0700 (PDT) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PfzbZ0F8dznYRR; Mon, 20 Mar 2023 10:44:42 +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.2507.21; Mon, 20 Mar 2023 10:47:45 +0800 From: Wupeng Ma To: CC: , , , , , Subject: [PATCH v4 4/4] mm/msync: return ENOMEM if len overflows for msync Date: Mon, 20 Mar 2023 10:47:39 +0800 Message-ID: <20230320024739.224850-5-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320024739.224850-1-mawupeng1@huawei.com> References: <20230320024739.224850-1-mawupeng1@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 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