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 F256BC4332F for ; Sun, 6 Nov 2022 20:24:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1FBFB80008; Sun, 6 Nov 2022 15:24:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1AB9B80007; Sun, 6 Nov 2022 15:24:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 074C680008; Sun, 6 Nov 2022 15:24:03 -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 EC7CF80007 for ; Sun, 6 Nov 2022 15:24:02 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A461D1C5D4F for ; Sun, 6 Nov 2022 20:24:01 +0000 (UTC) X-FDA: 80104143882.20.090E4EA Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf07.hostedemail.com (Postfix) with ESMTP id E05BE40007 for ; Sun, 6 Nov 2022 20:23:59 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1897D21EC4; Sun, 6 Nov 2022 20:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1667766238; h=from:from:reply-to: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=pIZQvJkOXMu5f5ncgLVznHSCKNS/Jviq7uNbN/RW5Bo=; b=FuTiZBSeSwo20pDcxBzlBbULYTF4Fi0Ze9NoVLrAOErRj5OiR2I9jPC7HFZOWeqcRVJwMs 3MAzIy4+ETCetZlLfMIxzEzE7O3OHoeb/cK8uOO3nPsxKp5XkfwpEELC0DVkaHdR37UulO CZemJmItaFTaR7fyHS4I/EBkMRmOVTc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1667766238; h=from:from:reply-to: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=pIZQvJkOXMu5f5ncgLVznHSCKNS/Jviq7uNbN/RW5Bo=; b=B8Y8sZPepMIqwwi83F/Y3Ly+9sVinxFhCmNBRE6RWjB17sMX1zGS7lfWyVJeyu8MqY8iPP A/pqKVBucwxxS2AA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CC0E81376E; Sun, 6 Nov 2022 20:23:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8T9XMN0XaGM7eQAAMHmgww (envelope-from ); Sun, 06 Nov 2022 20:23:57 +0000 Message-ID: Date: Sun, 6 Nov 2022 21:23:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH] mm/slab_common: Restore passing "caller" for tracing Content-Language: en-US To: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Kees Cook Cc: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , linux-mm@kvack.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org References: <20221105063529.never.818-kees@kernel.org> From: Vlastimil Babka In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667766240; 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:dkim-signature; bh=pIZQvJkOXMu5f5ncgLVznHSCKNS/Jviq7uNbN/RW5Bo=; b=STvM0Q1LXHkzvy1vQZBHlcqdt0kltaB5WZSmtmNsHtH8Et+gZK29P2+qXQda4DupZ6zXOe uZXBMFq7bFQpU9celVBDTucLmQDp3/U0dUvj1tf50GsinVSenJl+NhkeDZDmlLjQggtrpt E0bQ8XBLrtdL+VlwgyJlO0xYg/s7bvI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=FuTiZBSe; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=B8Y8sZPe; spf=pass (imf07.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667766240; a=rsa-sha256; cv=none; b=pg1NVO9PkZxoW7MKTvz/u+7WhGMbiTUSukT7E45DFNZMFxQMGWgA5ZcreVxyaJy+djeSxt /yK0QjtriWT++CMioFhVxg2KPAZuz1pFUZJtKoCZhRNuoEy1iB6a93BfBXOW/oG5rekCW4 7OP/Ei/z29UTZ2r6zl75VU12S2KrJq4= X-Rspamd-Queue-Id: E05BE40007 X-Rspam-User: X-Rspamd-Server: rspam08 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=FuTiZBSe; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=B8Y8sZPe; spf=pass (imf07.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-Stat-Signature: 34tzx4rrkzef8ubjsxzebuwz1z3kxgo7 X-HE-Tag: 1667766239-541358 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 11/6/22 11:46, Hyeonggon Yoo wrote: > On Fri, Nov 04, 2022 at 11:35:34PM -0700, Kees Cook wrote: >> The "caller" argument was accidentally being ignored in a few places >> that were recently refactored. Restore these "caller" arguments, instead >> of _RET_IP_. >> >> Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > >> Cc: Vlastimil Babka >> Cc: Christoph Lameter >> Cc: Pekka Enberg >> Cc: David Rientjes >> Cc: Joonsoo Kim >> Cc: Andrew Morton >> Cc: Roman Gushchin >> Cc: linux-mm@kvack.org >> Fixes: 11e9734bcb6a ("mm/slab_common: unify NUMA and UMA version of tracepoints") >> Cc: stable@vger.kernel.org > > > BTW I think it can be just sent to next release candidate. > The referred commit was merged in this development cycle. Yep, dropped the Cc stable for that reason. Pushed to slab/for-6.1-rc4/fixes and will send a PR to Linus in few days. Thanks! >> Signed-off-by: Kees Cook >> --- >> mm/slab_common.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/mm/slab_common.c b/mm/slab_common.c >> index 33b1886b06eb..0e614f9e7ed7 100644 >> --- a/mm/slab_common.c >> +++ b/mm/slab_common.c >> @@ -941,7 +941,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller >> >> if (unlikely(size > KMALLOC_MAX_CACHE_SIZE)) { >> ret = __kmalloc_large_node(size, flags, node); >> - trace_kmalloc(_RET_IP_, ret, size, >> + trace_kmalloc(caller, ret, size, >> PAGE_SIZE << get_order(size), flags, node); >> return ret; >> } >> @@ -953,7 +953,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller >> >> ret = __kmem_cache_alloc_node(s, flags, node, size, caller); >> ret = kasan_kmalloc(s, ret, size, flags); >> - trace_kmalloc(_RET_IP_, ret, size, s->size, flags, node); >> + trace_kmalloc(caller, ret, size, s->size, flags, node); >> return ret; >> } >> >> -- >> 2.34.1 > > > Thanks for catching this! >