From patchwork Tue Dec 19 22:29:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13499314 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 100B3C41535 for ; Tue, 19 Dec 2023 22:32:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCF6E6B0099; Tue, 19 Dec 2023 17:32:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ADDCF6B009C; Tue, 19 Dec 2023 17:32:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 934806B009D; Tue, 19 Dec 2023 17:32:33 -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 806E56B0099 for ; Tue, 19 Dec 2023 17:32:33 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 575141603FC for ; Tue, 19 Dec 2023 22:32:33 +0000 (UTC) X-FDA: 81585018186.05.537D2C8 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) by imf10.hostedemail.com (Postfix) with ESMTP id 72681C0025 for ; Tue, 19 Dec 2023 22:32:31 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="ljf0/KaK"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf10.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.180 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703025151; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=e29xpsueqsta+pB4dpMwNezQWpITpFZrOcR7dgpqXnM=; b=8ZG8SzeObm4CeRIQf6KaCg3GkXDwSWOIY9w7RmX0r/NEX4RX2rNJ8ddYE3J51BndPukHXs eXoznj/C76lEmxDMAnPsWtcH0L6qy7+NAr3bpb8v3DpBxSVeT8c5T9QPkA7SFSB3boIVg9 MCBUO7WqG4+64HSEdDCT53Nt4KuLH9o= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="ljf0/KaK"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf10.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.180 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703025151; a=rsa-sha256; cv=none; b=wU2P/HQeAaxm5j++Wg85D6+J/O6XdYAjRQdMktHuoCr1T2/d6PfboG7oFhy1Ovn6H9j0sj WGv2QWy5hybLH0KJl6lRDQf5n8wA5pO073LZp2mYYhjb3Zb9Kiqp9W2Lwl1sfnMafJj0x7 ZYvTyutBNhPuyYA0pUKPe/gkBxNlZ04= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1703025149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e29xpsueqsta+pB4dpMwNezQWpITpFZrOcR7dgpqXnM=; b=ljf0/KaKFmDC2Uyj9pcq18seQDB62a/kgliZneYzRVKag4kgTWvduY54lnptev/4IOVTKg XWh9fADptQruk8bYRvzl+jF0l8p4U0RNpQ3xZT3+C7DxlLuZnVWmBR0/EtI5V5z/V058ga q4EXpOfTgh0O1XTzevXYooHK4dHrhlQ= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Evgenii Stepanov , Breno Leitao , Alexander Lobakin , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH mm 20/21] skbuff: use mempool KASAN hooks Date: Tue, 19 Dec 2023 23:29:04 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 72681C0025 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: a7hijmnajbbmtrpfjt1y1awnh1us4jn4 X-HE-Tag: 1703025151-158419 X-HE-Meta: U2FsdGVkX19/kWDJR6VF9KrS7wYpEpkpuyU563eAO0tmz9O+9Jv26csmMrf1dm1FNYCT0aLt5PyIiZP1qFM0sc+mPIfd2fQlD2QnzWq49kH7/ZfBwRFrvIjTis+u9cSKCqAjZjft6B8lKg+I264mMRhFNTlIx3GhiEENnVoeUOHUXT9dPMl7F7Gr6t5I0tB14Y3K9HKxQsW8ixXSff6c/7q5Iyg6z9zaWgksqNCVcMrpu/TTc5n909cSgqdLQSRabjeTKyU2XhZAZem8lJq6Ww2cijPfHobmxKtcHlg0NYd3dhuZD7ZFCC0tY9pWp2KT1TP0i+mNldiSBXdk0ShqoMM9pUydQoPtTAqw0OjhTVuBSucNxB727hl1b1rQ8T1xAIk8nuZJMIGgWTreFz1t7PBcQm0brgHg0DOfQnvC7KjSPOtgAeMzHxWK5oyYSBnv2tf7HVwmHIGC81P2h75X2boSQZTNv7TCqbdZyytXr0thccV4Sdxykq1YNtRkjpbYkMq3nsrR7SZP42nxesHrupKO4SmN7rf4dkq6k+OafSdLQd5Wc1f2J99/X8epFn/44OiJHILD+DgnoiBeiwLAvVH7tChthXqIJmlZ4MCSSg6d9ke1X5/0X73ZMHGGxf/xkKDdOGz+Jl0iaLnAvhlLNsT4YziNGU5eWgKzdVN7VfLF4dTO/gQ9Ddi7wDUXS1okFwbw7MC8trwYTSBRkKSHc5/CAom+mmWT6MJGQoGC9QtgRS9zyus44K/sltRgdkV6650+GpJPUFyOA2kg/ca3bmlzouNcT4lIeNq6W3NqND8wSXZcxAT7KNAqlNo1vN3uZGpSqUAght8+UNXKrR/LMQXMLJY2AeLZ94WnGnbz05sGui94Sv4WholQGmP2Zsu5qMGYe3MhwQneutDHy32DsK90IoMUa4NtiY3j1z9ZIiAE4TyTfrJD6iyR2VxcpJbSSYwtPTAzgo7t+2NZU7X SvzihlAm DQWdcsFwTq4PXHDVZHfEMh/N2yNOkdZ9mJlctL5wsoPDLosOzcb2c8zYr/Uhn2ArN0VXrgWbxUfQyrDLZYG7ad0kGtb09dm8bIR1WYQE5sJzj0dwMKRCNhnaMdBZXYggrADLb/8SjyfgBEz1SqJntSTOk+oNU5SumiFmZFYCKDiOXTNLyhtQO4+m5x15QYG6lZNgosi6Es3d3etw= 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: List-Subscribe: List-Unsubscribe: From: Andrey Konovalov Instead of using slab-internal KASAN hooks for poisoning and unpoisoning cached objects, use the proper mempool KASAN hooks. Also check the return value of kasan_mempool_poison_object to prevent double-free and invali-free bugs. Signed-off-by: Andrey Konovalov --- net/core/skbuff.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 63bb6526399d..bb75b4272992 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -337,7 +337,7 @@ static struct sk_buff *napi_skb_cache_get(void) } skb = nc->skb_cache[--nc->skb_count]; - kasan_unpoison_new_object(skbuff_cache, skb); + kasan_mempool_unpoison_object(skb, kmem_cache_size(skbuff_cache)); return skb; } @@ -1309,13 +1309,15 @@ static void napi_skb_cache_put(struct sk_buff *skb) struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache); u32 i; - kasan_poison_new_object(skbuff_cache, skb); + if (!kasan_mempool_poison_object(skb)) + return; + nc->skb_cache[nc->skb_count++] = skb; if (unlikely(nc->skb_count == NAPI_SKB_CACHE_SIZE)) { for (i = NAPI_SKB_CACHE_HALF; i < NAPI_SKB_CACHE_SIZE; i++) - kasan_unpoison_new_object(skbuff_cache, - nc->skb_cache[i]); + kasan_mempool_unpoison_object(nc->skb_cache[i], + kmem_cache_size(skbuff_cache)); kmem_cache_free_bulk(skbuff_cache, NAPI_SKB_CACHE_HALF, nc->skb_cache + NAPI_SKB_CACHE_HALF);