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>, <david@redhat.com>
Subject: [PATCH v4 0/4] Add overflow checks for several syscalls
Date: Mon, 20 Mar 2023 10:47:35 +0800 [thread overview]
Message-ID: <20230320024739.224850-1-mawupeng1@huawei.com> (raw)
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.
Similar logic is used to fix problems with multiple syscalls.
Here is the testcases:
#include <stdio.h>
#define _GNU_SOURCE
#include <sys/mman.h>
#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <limits.h>
#include <numaif.h>
extern int errno;
int main(void)
{
int fd;
int ret;
void *addr;
int size = getpagesize();
fd = open("/tmp/testfile", O_RDWR | O_CREAT);
if (fd < 0) {
printf("open file error! errno: %d\n", errno);
return -1;
}
printf("open success\n");
addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (addr == MAP_FAILED) {
printf("open file error! errno: %d\n", errno);
close(fd);
return -1;
}
printf("mmap success\n");
memset(addr, 0, size);
printf("==== mlock ====\n");
ret = mlock(addr, ULONG_MAX);
if (ret == -1 && errno == EINVAL)
printf("mlock test passed\n");
else
printf("mlock test failed, ret: %d, errno: %d\n", ret, errno);
printf("==== set_mempolicy_home_node ====\n");
ret = syscall(450, addr, ULONG_MAX, 0, 0);
if (ret == -1 && errno == EINVAL)
printf("set_mempolicy_home_node test passed\n");
else
printf("set_mempolicy_home_node test failed, ret: %d, errno: %d\n", ret, errno);
printf("==== mbind ====\n");
unsigned long nodemask = 1Ul << 0;
long max_node = 8 * sizeof(nodemask);
ret = mbind(addr, ULONG_MAX, MPOL_BIND, &nodemask, max_node, MPOL_MF_MOVE_ALL);
if (ret == -1 && errno == EINVAL)
printf("mbind test passed\n");
else
printf("mbind test failed, ret: %d, errno: %d\n", ret, errno);
printf("==== msync ====\n");
ret = msync(addr, ULONG_MAX, MS_ASYNC);
if (ret == -1 && errno == ENOMEM)
printf("mbind test passed\n");
else
printf("mbind test failed, ret: %d, errno: %d\n", ret, errno);
munmap(mmap, size);
return 0;
}
Changelog since v3[3]:
- rebase to the latest master
- add simple testcases
Changelog since v2[2]:
- modified the way of checking overflows based on Andrew's comments
Changelog since v1[1]:
- only check overflow rather than access_ok to keep backward-compatibility
[1]: https://lore.kernel.org/lkml/20221228141701.c64add46c4b09aa17f605baf@linux-foundation.org/T/
[2]: https://lore.kernel.org/linux-mm/20230116115813.2956935-5-mawupeng1@huawei.com/T/
[3]: https://lore.kernel.org/linux-mm/de4149c7-0e6e-2035-3fb8-2f9da9633704@huawei.com/T/
Ma Wupeng (4):
mm/mlock: return EINVAL if len overflows for mlock/munlock
mm/mempolicy: return EINVAL for if len overflows for
set_mempolicy_home_node
mm/mempolicy: return EINVAL if len overflows for mbind
mm/msync: return ENOMEM if len overflows for msync
mm/mempolicy.c | 6 ++++--
mm/mlock.c | 8 ++++++++
mm/msync.c | 3 ++-
3 files changed, 14 insertions(+), 3 deletions(-)
--
2.25.1
next reply other threads:[~2023-03-20 2:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 2:47 Wupeng Ma [this message]
2023-03-20 2:47 ` [PATCH v4 1/4] mm/mlock: return EINVAL if len overflows for mlock/munlock Wupeng Ma
2023-03-20 10:54 ` David Hildenbrand
2023-03-20 11:05 ` mawupeng
2023-03-21 7:44 ` mawupeng
2023-03-21 14:19 ` David Hildenbrand
2023-03-22 2:14 ` mawupeng
2023-03-22 8:54 ` David Hildenbrand
2023-03-22 9:01 ` David Hildenbrand
2023-03-22 9:20 ` mawupeng
2023-03-22 11:27 ` David Hildenbrand
2023-03-20 2:47 ` [PATCH v4 2/4] mm/mempolicy: return EINVAL for if len overflows for set_mempolicy_home_node Wupeng Ma
2023-03-20 2:47 ` [PATCH v4 3/4] mm/mempolicy: return EINVAL if len overflows for mbind Wupeng Ma
2023-03-20 2:47 ` [PATCH v4 4/4] mm/msync: return ENOMEM if len overflows for msync Wupeng Ma
2023-03-20 11:06 ` [PATCH v4 0/4] Add overflow checks for several syscalls 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=20230320024739.224850-1-mawupeng1@huawei.com \
--to=mawupeng1@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=david@redhat.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;
as well as URLs for NNTP newsgroup(s).