From: Wupeng Ma <mawupeng1@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<mawupeng1@huawei.com>, <kuleshovmail@gmail.com>,
<aneesh.kumar@linux.ibm.com>
Subject: [PATCH v3 1/4] mm/mlock: return EINVAL if len overflows for mlock/munlock
Date: Sat, 28 Jan 2023 14:32:26 +0800 [thread overview]
Message-ID: <20230128063229.989058-2-mawupeng1@huawei.com> (raw)
In-Reply-To: <20230128063229.989058-1-mawupeng1@huawei.com>
From: Ma Wupeng <mawupeng1@huawei.com>
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 = 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.
Return 0 early to avoid burn a bunch of cpu cycles if len == 0.
Signed-off-by: Ma Wupeng <mawupeng1@huawei.com>
---
mm/mlock.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/mm/mlock.c b/mm/mlock.c
index 7032f6dd0ce1..eb09968ba27f 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -478,8 +478,6 @@ static int apply_vma_lock_flags(unsigned long start, size_t len,
end = start + len;
if (end < start)
return -EINVAL;
- if (end == start)
- return 0;
vma = mas_walk(&mas);
if (!vma)
return -ENOMEM;
@@ -575,7 +573,13 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla
if (!can_do_mlock())
return -EPERM;
+ if (!len)
+ return 0;
+
len = PAGE_ALIGN(len + (offset_in_page(start)));
+ if (!len)
+ return -EINVAL;
+
start &= PAGE_MASK;
lock_limit = rlimit(RLIMIT_MEMLOCK);
@@ -635,7 +639,13 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
start = untagged_addr(start);
+ if (!len)
+ return 0;
+
len = PAGE_ALIGN(len + (offset_in_page(start)));
+ if (!len)
+ return -EINVAL;
+
start &= PAGE_MASK;
if (mmap_write_lock_killable(current->mm))
--
2.25.1
next prev parent reply other threads:[~2023-01-28 6:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-28 6:32 [PATCH v3 0/4] Add overflow checks for several syscalls Wupeng Ma
2023-01-28 6:32 ` Wupeng Ma [this message]
2023-02-03 17:14 ` [PATCH v3 1/4] mm/mlock: return EINVAL if len overflows for mlock/munlock David Hildenbrand
2023-02-06 0:48 ` mawupeng
2023-02-06 17:05 ` David Hildenbrand
2023-02-07 1:24 ` mawupeng
2023-02-08 13:51 ` David Hildenbrand
2023-02-09 11:35 ` mawupeng
2023-01-28 6:32 ` [PATCH v3 2/4] mm/mempolicy: return EINVAL for if len overflows for set_mempolicy_home_node Wupeng Ma
2023-01-28 6:32 ` [PATCH v3 3/4] mm/mempolicy: return EINVAL if len overflows for mbind Wupeng Ma
2023-01-28 6:32 ` [PATCH v3 4/4] mm/msync: return ENOMEM if len overflows for msync Wupeng Ma
2023-02-03 17:10 ` [PATCH v3 0/4] Add overflow checks for several syscalls David Hildenbrand
2023-02-06 0:52 ` mawupeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230128063229.989058-2-mawupeng1@huawei.com \
--to=mawupeng1@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=kuleshovmail@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox