Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 6 Nov 2022 19:46:15 +0900
From:   Hyeonggon Yoo <42.hyeyoo@gmail.com>
To:     Kees Cook <keescook@chromium.org>
Cc:     Vlastimil Babka <vbabka@suse.cz>, Christoph Lameter <cl@linux.com>,
        Pekka Enberg <penberg@kernel.org>,
        David Rientjes <rientjes@google.com>,
        Joonsoo Kim <iamjoonsoo.kim@lge.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Roman Gushchin <roman.gushchin@linux.dev>, 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: <Y2eQd365DU6Zi9wr@hyeyoo>
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>
Precedence: bulk

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 <vbabka@suse.cz>
> Cc: Christoph Lameter <cl@linux.com>
> Cc: Pekka Enberg <penberg@kernel.org>
> Cc: David Rientjes <rientjes@google.com>
> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Roman Gushchin <roman.gushchin@linux.dev>
> 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 <keescook@chromium.org>
> ---
>  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