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 0153BC433FE for ; Sat, 25 Dec 2021 05:12:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91F886B0082; Sat, 25 Dec 2021 00:12:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A7DD6B0083; Sat, 25 Dec 2021 00:12:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 798176B0085; Sat, 25 Dec 2021 00:12:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0230.hostedemail.com [216.40.44.230]) by kanga.kvack.org (Postfix) with ESMTP id 676026B0082 for ; Sat, 25 Dec 2021 00:12:55 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 24F92181AC9C6 for ; Sat, 25 Dec 2021 05:12:55 +0000 (UTC) X-FDA: 78955147110.24.D0C5DDD Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf18.hostedemail.com (Postfix) with ESMTP id 759361C004D for ; Sat, 25 Dec 2021 05:12:47 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C2233B80B35; Sat, 25 Dec 2021 05:12:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CBB7C36AE9; Sat, 25 Dec 2021 05:12:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1640409172; bh=jPUpNfcBmAylk47gLumr+4CKaHngBKm43WyY6AGe6sU=; h=Date:From:To:Subject:In-Reply-To:From; b=ALQmLvE6+9vYqf8bBBPI0u+9wYJD96dF5vTqgRHZvNbjNa5imDeIAb+edAmGqcEBC 6QCuqqLue04Pdy0co/DRAXpNaBe0Mp6GfuPjZqvBi4Z63wcfr+chqCT6Zeq2KAKWg3 UZJtVVVBIO0fFkeDzTypbxYxU0RHZpJcFwYmXsVg= Date: Fri, 24 Dec 2021 21:12:51 -0800 From: Andrew Morton To: akpm@linux-foundation.org, danielmicay@gmail.com, keescook@chromium.org, levente@leventepolyak.net, linux-mm@kvack.org, mm-commits@vger.kernel.org, thibaut.sautereau@ssi.gouv.fr, torvalds@linux-foundation.org Subject: [patch 7/9] mm/page_alloc: fix __alloc_size attribute for alloc_pages_exact_nid Message-ID: <20211225051251.h8Du-oj8Q%akpm@linux-foundation.org> In-Reply-To: <20211224211127.30b60764d059ff3b0afea38a@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 759361C004D X-Stat-Signature: rkqkisad9xkroiyxuwmqgaoywtgq84h5 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=ALQmLvE6; spf=pass (imf18.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-HE-Tag: 1640409167-741681 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: Thibaut Sautereau Subject: mm/page_alloc: fix __alloc_size attribute for alloc_pages_exact_nid The second parameter of alloc_pages_exact_nid is the one indicating the size of memory pointed by the returned pointer. Link: https://lkml.kernel.org/r/YbjEgwhn4bGblp//@coeus Fixes: abd58f38dfb4 ("mm/page_alloc: add __alloc_size attributes for better bounds checking") Signed-off-by: Thibaut Sautereau Acked-by: Kees Cook Cc: Daniel Micay Cc: Levente Polyak Signed-off-by: Andrew Morton --- include/linux/gfp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/gfp.h~mm-page_alloc-fix-__alloc_size-attribute-for-alloc_pages_exact_nid +++ a/include/linux/gfp.h @@ -624,7 +624,7 @@ extern unsigned long get_zeroed_page(gfp 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) _