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 0618CC433EF for ; Tue, 14 Dec 2021 17:06:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EA1D6B0071; Tue, 14 Dec 2021 12:06:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 899886B0073; Tue, 14 Dec 2021 12:06:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7880B6B0074; Tue, 14 Dec 2021 12:06:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0151.hostedemail.com [216.40.44.151]) by kanga.kvack.org (Postfix) with ESMTP id 69D0D6B0071 for ; Tue, 14 Dec 2021 12:06:32 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2910682499B9 for ; Tue, 14 Dec 2021 17:06:22 +0000 (UTC) X-FDA: 78917028204.11.680ECE6 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf04.hostedemail.com (Postfix) with ESMTP id B319540006 for ; Tue, 14 Dec 2021 17:06:21 +0000 (UTC) Received: by mail-pj1-f41.google.com with SMTP id r34-20020a17090a43a500b001b0f0837ce8so1582194pjg.2 for ; Tue, 14 Dec 2021 09:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=IvqOA246pz6MpJ2Qx8Vk8PM4dTJlnXdWQbQp45Jo7eU=; b=AGLcpSoCRP3mDHqZy9q6CHC/f/cQL4x6F2nPdN5iAtowhi/xHCfoPYeaYA5s2BUZFr XM03O7Z8KGaszQlBTNjAm+2lZkdPb6RAsdCxlWStWODnyBHc97RCmXTuXjrG5nVSFFdz pbwjXtm5k/DnTwAob5ndMTz3YmBpTezQn8hxM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=IvqOA246pz6MpJ2Qx8Vk8PM4dTJlnXdWQbQp45Jo7eU=; b=dlIfEntWlO5XEzSvAScVH/q7B4YLotdBtoS4cWd1eoZnmkP6bE5sH51xLNQoB1UkSg pLl/Cd3RnNwZrW9btsRaayce9v8SWVIftDdjRecpuGN0WtT4IF1TexGe4J2p547ebjgT 03QAMTdQOgkFY+SpQeh04epxcFvkBcxyO3QOW2TN5+VDZi+BxuuOBFZlWbn6AIlB81SV eB9k7ufWLIkv2NQSnAb/1iACXZ2s/6kkGjn2Ccuwkp1CFkqSfjbsgJuyxpdfkXqMiKJ9 Mb9NoIr2fc2dyKwxVxO55qeAr5y9OWxjFqhDE3F1tb29A2nC8llILslCXsnDC9IA4aDS D8zw== X-Gm-Message-State: AOAM533UWQR/TZ56uWCJgkZ2dFKtKT2V+WSqpd+/GGfhFi/izz6TIROP 8qr+aj6UvZxMQcyqsi1rfDpmYQ== X-Google-Smtp-Source: ABdhPJxVwqDR4+vDuC91Bf9YfHuFRkh+AN9IOxfGAait4qoh9fmClkfVrhdtcTc/ZF4Ld0JJiXNP3A== X-Received: by 2002:a17:902:ecc4:b0:148:a2e8:2784 with SMTP id a4-20020a170902ecc400b00148a2e82784mr248013plh.139.1639501580488; Tue, 14 Dec 2021 09:06:20 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id 204sm280350pgb.63.2021.12.14.09.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 09:06:20 -0800 (PST) Date: Tue, 14 Dec 2021 09:06:19 -0800 From: Kees Cook To: Thibaut Sautereau Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Daniel Micay , Levente Polyak , Thibaut Sautereau Subject: Re: [PATCH] mm/page_alloc: Fix __alloc_size attribute for alloc_pages_exact_nid Message-ID: <202112140906.80FA30E@keescook> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B319540006 X-Stat-Signature: i7fb54hp1h8jixujio6gknzta7zpzopu Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=AGLcpSoC; spf=pass (imf04.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.41 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-HE-Tag: 1639501581-629132 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: On Tue, Dec 14, 2021 at 05:21:23PM +0100, Thibaut Sautereau wrote: > From: Thibaut Sautereau > > The second parameter of alloc_pages_exact_nid is the one indicating the > size of memory pointed by the returned pointer. > > Fixes: abd58f38dfb4 ("mm/page_alloc: add __alloc_size attributes for better bounds checking") > Cc: Daniel Micay > Cc: Kees Cook > Cc: Levente Polyak > Signed-off-by: Thibaut Sautereau Thanks! Andrew, can you take this? Acked-by: Kees Cook -Kees > --- > include/linux/gfp.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index b976c4177299..8fcc38467af6 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -624,7 +624,7 @@ extern unsigned long get_zeroed_page(gfp_t gfp_mask); > > void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __alloc_size(1); > void free_pages_exact(void *virt, size_t size); > -__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(1); > +__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(2); > > #define __get_free_page(gfp_mask) \ > __get_free_pages((gfp_mask), 0) > -- > 2.34.1 > -- Kees Cook