From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5E2CC47089 for ; Mon, 5 Dec 2022 03:41:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D99C38E0002; Sun, 4 Dec 2022 22:41:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 924408E0008; Sun, 4 Dec 2022 22:41:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5665F8E0007; Sun, 4 Dec 2022 22:41:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2DD8D8E0001 for ; Sun, 4 Dec 2022 22:41:28 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EE6EC160280 for ; Mon, 5 Dec 2022 03:41:27 +0000 (UTC) X-FDA: 80206852614.22.211D6DA Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf11.hostedemail.com (Postfix) with ESMTP id 298964000D for ; Mon, 5 Dec 2022 03:41:25 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670211687; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NwtykVj9Dud2Or4c3t6+VlWZEj6+Tj9uP3fxvwkYhQA=; b=hYJ4M5UjXx/GfAONTIFOWXHcrRa+H7x/Ehwi19Jks8WHFmOBS6fsCwlzov3DIEIixETj3R s4nKqXRzK15ZUrI8ZAN4mHeTiHPXFew3UhyGfbjYwT9tYsVVlHud9opu2CVNclSPM2zoC1 AecOV0pCDLdo3PWNA5bqRxJOLpvfF+8= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670211687; a=rsa-sha256; cv=none; b=dztO7PF9jRPzsm7N8kqc/clJGPnWPM2n6kX7U3/Dvh2mRwPyOuwamncA7yBSVOhmrY3KRL F594nKSCndPCNjbt3NwcJuQUQ+iYpU+m+8JqqChqkUp1nMSxSojdyBdRw1RIm+27dsbAw2 ywsENioxmcqvVqghQZu0c87XQ7LNb1I= Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NQTpW2XpjzRpl3; Mon, 5 Dec 2022 11:40: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.31; Mon, 5 Dec 2022 11:41:22 +0800 From: Wupeng Ma To: CC: , , , , , Subject: [PATCH 1/4] mm/mlock: return EINVAL for illegal user memory range in mlock Date: Mon, 5 Dec 2022 11:41:05 +0800 Message-ID: <20221205034108.3365182-2-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205034108.3365182-1-mawupeng1@huawei.com> References: <20221205034108.3365182-1-mawupeng1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 298964000D X-Stat-Signature: gwpxhzmfotq3xipetdw76tn1gxwgkxqt X-Spamd-Result: default: False [2.14 / 9.00]; R_MISSING_CHARSET(2.50)[]; MID_CONTAINS_FROM(1.00)[]; BAYES_HAM(-0.66)[75.86%]; DMARC_POLICY_ALLOW(-0.50)[huawei.com,quarantine]; R_SPF_ALLOW(-0.20)[+ip4:45.249.212.187/29]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_THREE(0.00)[3]; MIME_TRACE(0.00)[0:+]; HAS_XOIP(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[] X-Rspam-User: X-HE-Tag: 1670211685-508824 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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. Since TASK_SIZE is the maximum user space address. The start or len of mlock shouldn't be bigger than this. Function access_ok can be used to check this issue, so return -EINVAL if bigger. Signed-off-by: Ma Wupeng --- mm/mlock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/mlock.c b/mm/mlock.c index 7032f6dd0ce1..b9422a62a4cf 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -575,6 +575,9 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla if (!can_do_mlock()) return -EPERM; + if (unlikely(!access_ok((void __user *)start, len))) + return -EINVAL; + len = PAGE_ALIGN(len + (offset_in_page(start))); start &= PAGE_MASK; @@ -635,6 +638,9 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) start = untagged_addr(start); + if (unlikely(!access_ok((void __user *)start, len))) + return -EINVAL; + len = PAGE_ALIGN(len + (offset_in_page(start))); start &= PAGE_MASK; -- 2.25.1