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 73040C6FD1D for ; Mon, 20 Mar 2023 11:10:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbjCTLKV (ORCPT ); Mon, 20 Mar 2023 07:10:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231142AbjCTLJ7 (ORCPT ); Mon, 20 Mar 2023 07:09:59 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DDB52CFC6 for ; Mon, 20 Mar 2023 04:06:13 -0700 (PDT) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PgBff1STZznXpm; Mon, 20 Mar 2023 19:03:06 +0800 (CST) Received: from [10.174.178.120] (10.174.178.120) 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 19:06:10 +0800 Message-ID: Date: Mon, 20 Mar 2023 19:06:10 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 CC: , , , , , Subject: Re: [PATCH v4 0/4] Add overflow checks for several syscalls Content-Language: en-US To: References: <20230320024739.224850-1-mawupeng1@huawei.com> From: mawupeng In-Reply-To: <20230320024739.224850-1-mawupeng1@huawei.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.178.120] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) 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 Sorry for wasting your time. I send the wrong version of this patchset, this is the older version. I will send the right one later. On 2023/3/20 10:47, Wupeng Ma wrote: > 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 = 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 > #define _GNU_SOURCE > #include > #include > #include > #include > #include > #include > #include > > 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(-) >