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 5F9E1ECAAD3 for ; Wed, 14 Sep 2022 06:52:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F14996B0073; Wed, 14 Sep 2022 02:52:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC1B76B0074; Wed, 14 Sep 2022 02:52:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8A268D0001; Wed, 14 Sep 2022 02:52:46 -0400 (EDT) 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 CB1306B0073 for ; Wed, 14 Sep 2022 02:52:46 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A3F9EAB6B3 for ; Wed, 14 Sep 2022 06:52:46 +0000 (UTC) X-FDA: 79909773132.28.8C6544D Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf11.hostedemail.com (Postfix) with ESMTP id 65DD540091 for ; Wed, 14 Sep 2022 06:52:46 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id j6-20020a17090a694600b00200bba67dadso13522787pjm.5 for ; Tue, 13 Sep 2022 23:52:46 -0700 (PDT) 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; bh=4ODUVD1mcXWe7gBOsFOiDmJcOhv1IVWlguZotwIBftc=; b=hyg6gOvOM4+woDFtgP0pnABwWLumEzTXPtcQPNm81+6EBCo6VIcl/hKtx57jt+KoHc HyWz/ZtJ34vmU/bl2NLg0vvt/2AYpyHAKNbhVsKrAIX17obNmW9XMQFjc/KMNOzSXAxn 16ALPrxmxdBvm5R4h6I/uGI/j+KIy44rP0CTBQvh884Qrvn4gNcCXQRyMQg/b8Cf3Ajb ZGYoMJRFV+22AvrJa+0xIk/ALVWODByou5ohx65vRw7MBFH9AzZkA1FGgvMjFDkt4pzJ y0/JBVbZYTi7ePDqJQisZpnj9s9gOSiUBxg3F2DxAd9c7DxnGl4mXG/sNJMRUDWod3MP nTEA== 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; bh=4ODUVD1mcXWe7gBOsFOiDmJcOhv1IVWlguZotwIBftc=; b=BFAkcGGoQW9xpN8dPVIBB6pWQQVNM6scWmSiyGQlTr4B+ZzprX2/cqhsK/sAbnwkZd cp2ferVTFFYyyt9OyCh5V03cbY0VQ9Fe3AfEaNM5kzevWEwvi4hAe8OHiuwfg7X83OI9 OdZJxVwcJbpArMj42upWmaZe0qHidBwQd6e/lqRwoKgSkytUWfYHk3dpWPZUP8cPKXol 8UY4n39FDc+1/ZNYcVVkiW3kdpZ9cpUkrZgM0ScFiwNAm2wNBGNUaVlgZ2CQsWi54ZE4 Rk4E7xAoDUQtyHDsK95tI3VF5YT9N4nSDdpqULjdqZRbOd44sArtfzzoyBDVMtvCpcQC QjFg== X-Gm-Message-State: ACgBeo1KHC1hJoKIa/SQRG62tB31D3YV9vJZxnGDlm1xCLA2uQC5W1bN DuDM6wN+PxdslGA3g1owAlN3yZAkRow= X-Google-Smtp-Source: AA6agR4wL/Ujw0bI90QfyMDeBvjdUnPTT+pN4CqTFQBGj2DIJT0Gf4QdaNAcI2ZgBiR2+LrdD79IlQ== X-Received: by 2002:a17:903:24f:b0:172:7d68:cf1 with SMTP id j15-20020a170903024f00b001727d680cf1mr35213268plh.55.1663138365395; Tue, 13 Sep 2022 23:52:45 -0700 (PDT) Received: from hyeyoo ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id k72-20020a62844b000000b0053e8368ec34sm9147565pfd.32.2022.09.13.23.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 23:52:44 -0700 (PDT) Date: Wed, 14 Sep 2022 15:52:39 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Peter Collingbourne Cc: Andrey Konovalov , Andrew Morton , linux-mm@kvack.org, vbabka@suse.cz, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] kasan: call kasan_malloc() from __kmalloc_*track_caller() Message-ID: References: <20220914020001.2846018-1-pcc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220914020001.2846018-1-pcc@google.com> ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=hyg6gOvO; spf=pass (imf11.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.50 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=1663138366; a=rsa-sha256; cv=none; b=sKWOyBpGxjuokvL0yWUWB//01V5wJTG0rVCOEIZuHjilOpnOeXs9moRH57pxelZVQSe1tl 9nKKK4nbNRPcZiEHTQ2b/IC/Nty3Xos93LyitkhocuWwKBRX6KPJRzy6WtWOuPGvjLv//A DLSsJ0i+Z7StLdWGmPS20V6vBXlrDI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663138366; 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=4ODUVD1mcXWe7gBOsFOiDmJcOhv1IVWlguZotwIBftc=; b=rzKUQKOpnZjs7yhJcAgSbGS3fUYqwoVC4LwbW13ywejrCNKpbQHw7Vukd+FzQ3PpcSQksn wyACb50Gr0UbTs0wYDxi+MpuHNo2pqCvEP5SVMg8lsrnO3eLTLG2ZlRTV1Xv/FHtp1Huwt TFBfh60tapnFucsLWbiH7+lgQPBq3OI= X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=hyg6gOvO; spf=pass (imf11.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.50 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam04 X-Stat-Signature: ufuq55j5um4t4ji4bqbzgogrgyu6rhc9 X-Rspamd-Queue-Id: 65DD540091 X-HE-Tag: 1663138366-213379 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, Sep 13, 2022 at 07:00:01PM -0700, Peter Collingbourne wrote: > We were failing to call kasan_malloc() from __kmalloc_*track_caller() > which was causing us to sometimes fail to produce KASAN error reports > for allocations made using e.g. devm_kcalloc(), as the KASAN poison was > not being initialized. Fix it. > > Signed-off-by: Peter Collingbourne > Cc: # 5.15 > --- > The same problem is being fixed upstream in: > https://lore.kernel.org/all/20220817101826.236819-6-42.hyeyoo@gmail.com/ > as part of a larger patch series, but this more targeted fix seems > more suitable for the stable kernel. Hyeonggon, maybe you can add > this patch to the start of your series and it can be picked up > by the stable maintainers. > > mm/slub.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/mm/slub.c b/mm/slub.c > index 862dbd9af4f5..875c569c5cbe 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -4926,6 +4926,8 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, unsigned long caller) > /* Honor the call site pointer we received. */ > trace_kmalloc(caller, ret, s, size, s->size, gfpflags); > > + ret = kasan_kmalloc(s, ret, size, gfpflags); > + > return ret; > } > EXPORT_SYMBOL(__kmalloc_track_caller); > @@ -4957,6 +4959,8 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, > /* Honor the call site pointer we received. */ > trace_kmalloc_node(caller, ret, s, size, s->size, gfpflags, node); > > + ret = kasan_kmalloc(s, ret, size, gfpflags); > + > return ret; > } > EXPORT_SYMBOL(__kmalloc_node_track_caller); > -- > 2.37.2.789.g6183377224-goog > Ah, I should have sent it to stable team ;) I think "Option 3" in Documentation/process/stable-kernel-rules.rst will be appropriate, So will resend this after the series goes to Linus's tree. Thank you Peter! -- Thanks, Hyeonggon