From patchwork Thu Feb 6 06:15:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13962279 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 8E232C02198 for ; Thu, 6 Feb 2025 06:15:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B36EF6B008C; Thu, 6 Feb 2025 01:15:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AE8186B0093; Thu, 6 Feb 2025 01:15:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 962736B0092; Thu, 6 Feb 2025 01:15:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 716C86B0089 for ; Thu, 6 Feb 2025 01:15:26 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 318A1A0ECF for ; Thu, 6 Feb 2025 06:15:26 +0000 (UTC) X-FDA: 83088507852.01.1DAC0AC Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf26.hostedemail.com (Postfix) with ESMTP id 9D96F140002 for ; Thu, 6 Feb 2025 06:15:24 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=E1xkWOmc; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738822524; a=rsa-sha256; cv=none; b=xGTTmfM0RA3Is50+ssraPYOnhVmEh287gw+uNESqbc0YS9EnH0F0OTJJ/0IAUXR1RCFZjV qVWYyJn+Aij6Fymjqp6juL8oOjqthoE6TWqilkoy8KE1Nfz2wc5boX5jTVMa/ENHx33NTs Ceym0GXZfUWFj1RWzliOE5SMDZhdk9c= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=E1xkWOmc; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738822524; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ovut109HRvJumBRdKoPCxxldzgO8M/QDAOJI1ronHtE=; b=fAld3SMRrIRS3lZ2ev3HObAjwmZ60dYnMtp7cPEMT3z4jDARdFEc/sfAnJcwZG5dkhcZV4 y7hX7HrCVtEBKt76/uaSOJlHTlzeej32TuN2kwzwh79jlMgwOXh7uZhxAodrklJwzcpPlu nlSCVrEai6EeJuU5HGMtfW6reqoPzj8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id DE0E1A43D8A; Thu, 6 Feb 2025 06:13:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BACD7C4CEE5; Thu, 6 Feb 2025 06:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738822523; bh=mfBMQDGwCijsuSEaM5RCGlWQCxDRxNtkNxhQORCqX0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E1xkWOmctRFfUviRHAuoF/YWqqtLhCLSeVJMBCIZ5GOfqX1Em3z6RE1AsxPdoFvDD DcmtmDzLgBMTvvl9UJA+Jpmt30YKmA5ghNeJS2A6DqzlEe5dDoE7SVFsK1znh2SXXT m8kJckllh6o8rTjHTiWiWPNXY3TwvPqqeRkdlvE+X0eUk1rxbmFdJZ0d7CXqty/uXB 5vk5WFGbcI9uK2h/3oAZu064VNDhZGcd6TYV76rphB8u6smNhIJBi6Npo6PCYlWj02 1vcsPrkLrYI7Gp5UPuIGgBGedOPuWnhC4dxe6EWSGe+Gxxj6S3PhBWLyYVz4sV36CU 2vGrcVjrwY5IA== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Davidlohr Bueso , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/4] mm/madvise: split out madvise input validity check Date: Wed, 5 Feb 2025 22:15:15 -0800 Message-Id: <20250206061517.2958-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250206061517.2958-1-sj@kernel.org> References: <20250206061517.2958-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9D96F140002 X-Stat-Signature: znd314rpq7trayw565pzyyni6aacahdt X-Rspam-User: X-HE-Tag: 1738822524-774470 X-HE-Meta: U2FsdGVkX1/OQTOdiSZfuviTfKviYdL9neHZCPrAhvthvltJvVwnzLyrT/2+f3nC+a3XjjC+wHMca6yP0U45nOSMi9ayzbSiePZeQOkrLVYk2bBgICRLWWfFeHe3O8exe1btvaBxy2z2xoTwXSKD6y93ya5if+xwWK9k8IdpDVjpbnTVcHYAUTUcb0zMuUDUWoHLfovWt4weLPKqSz7KAxsIjykpkobJbLz4DwIGzAkirHhC+5mmKMIyvN6ZbM3LYREbP41peskBx3WkS+xKU52xRb5JrklbIddCTHb/ctquPpBsRUEhaj6XJ7f7u1tjvT05FIj7yjpar5EPmIQNSmYdPyYjEHTRtlWFaDsC3SH0NnH/jRwOHSWDUjKoALuLWxGMGF7u+qcsTiW56ZOK0zFtlPWubfjVCoRUI5hnwq7sumpGeDn9M+hZ7mWFFMNBTaUPWLUeCgkDLoKhoM56+J1EQokTBW71S4S5MO494DTJVRnpDc6xdaf7S2GF/qdvFmArxMUlgSxhEVTEsC1UEvgmNhRCmP/zF1A4tYoPdFQ8/YK+7EDXo6/9mARfQnQPbB0OtCGkIjEBGA7Hpz3wK8QfOLHGgKqT2j0EI8V+39i4qGKPsMd7ZACqd94fNZG0mehKla+BR0E/Nl+c41+vFDtOTNUYQyGF5o/dRJ/I/XD/2oUUmi2RmIdRiNdbjMZZu5UzIsJXncaikAG91zpsq50nWUYsb47bNxsjn4h+EXSR9QqrW77xKXb7gVIQUJTf9AKzgyElEQugT8sxK4CJ939E5HoNbSUj9Uyf0kLfAGPXDHLt9DP5GGFMA7JrMgZtna27S5PD2LOF5L+fZHANuJw8lmBw8P9G2r4wsw3zlhDsQfEqH7Bk81QkqrtjniRli2HL2TLLz5qHwNx+zPJ3yX1gflCI+nakMGBFYh7YnhFt1gHYFwCqUl40Dot59aV0ykqtbqiwHfLd92T2leD Nr4/y7xg 5XE/B/7hjpcSa00art+WjawZ1L22G4CQ7B9TvWU2xC4MxnlvqwcvD2Ih4muGz3B5lCgju2z2ZMO/TZaD51vYI8YqMs4sYbkaZVkB7raMjdlu/RlAkb+o8v7wKTWwYTqOfN8+ijCtyfrddBj5SsuEorCqF5gyeGGi3lkZ8r2whZ9lG2SfeSd/CTswx2qjsg4Or2tmtUrkSELw5Mgxa/mrIRTBOF7LYMyqc5adjw800x+Vjpgfvd2J4af/Apm7yyNeavhI1PT4CPRFs5K7xtjvqI6Rzff9RAsCMdOCya4Dwvn6UJjCNZZyRo5otow== 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: List-Subscribe: List-Unsubscribe: Split out the madvise parameters validation logic from do_madvise(), for easy reuse of the logic from a future change. Reviewed-by: Shakeel Butt Reviewed-by: Lorenzo Stoakes Reviewed-by: Davidlohr Bueso Signed-off-by: SeongJae Park Reviewed-by: Liam R. Howlett --- mm/madvise.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index df5a87a1846a..efab2878be7c 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1594,6 +1594,27 @@ static void madvise_unlock(struct mm_struct *mm, int behavior) mmap_read_unlock(mm); } +static bool is_valid_madvise(unsigned long start, size_t len_in, int behavior) +{ + size_t len; + + if (!madvise_behavior_valid(behavior)) + return false; + + if (!PAGE_ALIGNED(start)) + return false; + len = PAGE_ALIGN(len_in); + + /* Check to see whether len was rounded up from small -ve to zero */ + if (len_in && !len) + return false; + + if (start + len < start) + return false; + + return true; +} + /* * The madvise(2) system call. * @@ -1673,20 +1694,11 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh size_t len; struct blk_plug plug; - if (!madvise_behavior_valid(behavior)) + if (!is_valid_madvise(start, len_in, behavior)) return -EINVAL; - if (!PAGE_ALIGNED(start)) - return -EINVAL; len = PAGE_ALIGN(len_in); - - /* Check to see whether len was rounded up from small -ve to zero */ - if (len_in && !len) - return -EINVAL; - end = start + len; - if (end < start) - return -EINVAL; if (end == start) return 0;