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 D4057C433FE for ; Sun, 6 Nov 2022 10:46:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B508E8E0002; Sun, 6 Nov 2022 05:46:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B01C18E0001; Sun, 6 Nov 2022 05:46:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C9838E0002; Sun, 6 Nov 2022 05:46:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 899058E0001 for ; Sun, 6 Nov 2022 05:46:24 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 42BED809D9 for ; Sun, 6 Nov 2022 10:46:24 +0000 (UTC) X-FDA: 80102688288.19.D61F90F Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf09.hostedemail.com (Postfix) with ESMTP id C76CF140005 for ; Sun, 6 Nov 2022 10:46:22 +0000 (UTC) Received: by mail-pl1-f182.google.com with SMTP id p12so3187026plq.4 for ; Sun, 06 Nov 2022 02:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=d/7LW7lwY8oZ4ACHiAH4Aswn0e1LYPuf1ESlWFt5AVg=; b=nGhCIFW56DbH4ofS1cJb2PSk6GRFIeO3+Dhzi7S7NMo9WOgBAaEeYy11wNWusqx4/l xTOfj+ervuzKxBafkF/oN71uqUlyWrrfHOtmI0TeIuWfCaS38HCyBxXdx4drjJrqWt7G vgW2kUcjSdW2M84phs8EebVg5DmLpoXgCmGxXGCWJcSHsJBB0/wc/QP65kuDDkBxYmPI Ho4A0vgbfiSbLqa/9GGeJJ7xfwTz1ybvlqSnmv9tohjZrdTRm2+VYbDBXRPz22Yk4bE4 cL8JzsGXvou28PTOXMFQjAFwgZl3PfMjicMhJwUarlPxxfo87L2JmOhVZlhKpylgOb/Z EYOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=d/7LW7lwY8oZ4ACHiAH4Aswn0e1LYPuf1ESlWFt5AVg=; b=p+8Y2+EHc+OUNgInT1gI4n3Mk0jIZOCff337tL7AULA3d5+hFW5dkB7RIb8eFjnv3e 32uJs4/cssLB171G20Ii05YmdLDcGQTtCtgnmTfFbfFu6nz+3CXRMr0Aw47q8O3bALeV poAFZ+gwAaTK5VEwefYjEoRqde1XGI7K0ZYucY8/vWHNCrgm4HYgXdVFYOvr5lL1X65X dMqCq1gTfkbTIDbELqqcHYZxf/QmujEIGZR2OVCvUyqOYYeqCrzySwxO7Bg413j9UTxg cBqLUlDe6bkRL4w5Fvo4StmYvPVcdsr11ehRZkGSkxADesVdsUulWuyfoGVNO76RFhJ7 TZIA== X-Gm-Message-State: ACrzQf2YA4JSbbJIzKeFUf6zin9nyu1Y3uhGCMVoKNHK/KyuzoLVWIal 6pRZp0w9sDaJ7FnvGLzlfbA= X-Google-Smtp-Source: AMsMyM5Yzht930J/wG332Tukvnu/nP8d7xQg+MZzY26K16CEpClMjkoRJ9jmRJsG2OQpPQ1gTKln0A== X-Received: by 2002:a17:902:7897:b0:178:9292:57b9 with SMTP id q23-20020a170902789700b00178929257b9mr45547569pll.102.1667731581663; Sun, 06 Nov 2022 02:46:21 -0800 (PST) Received: from hyeyoo ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id a11-20020a170902eccb00b00186b7443082sm2923018plh.195.2022.11.06.02.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Nov 2022 02:46:20 -0800 (PST) Date: Sun, 6 Nov 2022 19:46:15 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Kees Cook Cc: Vlastimil Babka , 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 Subject: Re: [PATCH] mm/slab_common: Restore passing "caller" for tracing Message-ID: References: <20221105063529.never.818-kees@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221105063529.never.818-kees@kernel.org> ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=nGhCIFW5; spf=pass (imf09.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667731582; a=rsa-sha256; cv=none; b=uFa62VAD2AqeJ8MmygYEZQ3Bd1RzcI15YQ9irZHhMVT0b+oomLQFgdLe9iJxfFfx68jiKI OH8yX8N6xKaztnnPKVpFe1MJE76Dub6qgavgNvqYESNrR6b889CXBYpqU9cu0h/Zr7tJNC 5potO/p+beyatwCdykWysQFQ4T7q7XM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667731582; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d/7LW7lwY8oZ4ACHiAH4Aswn0e1LYPuf1ESlWFt5AVg=; b=vcoT+afsgBlO4jCGhyOtPOvi5pONt6OUK5bP2se4rCgP3qC29wJ8ihHMcKbQ8WKFbqWGb8 6In3DQ8MtlYCcavEUotPgW3nkwBn9Ko8KA1jgtL6hAAJL4wGPxlKLuXCc7TOJ7Vf9fggmu 4uz11Q8yeBC4XwC7+Fubw0Oh5tN4hwg= X-Stat-Signature: qtdi15tcxrr7mtebyy4uq176i5e9jbyh X-Rspamd-Queue-Id: C76CF140005 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=nGhCIFW5; spf=pass (imf09.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1667731582-44877 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 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. > 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! -- Thanks, Hyeonggon