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 C4A11ECAAA1 for ; Thu, 27 Oct 2022 19:15:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F4C66B0071; Thu, 27 Oct 2022 15:15:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A42A6B0073; Thu, 27 Oct 2022 15:15:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 06C9E6B0074; Thu, 27 Oct 2022 15:15:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E96386B0071 for ; Thu, 27 Oct 2022 15:15:23 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BCDF01A02FF for ; Thu, 27 Oct 2022 19:15:23 +0000 (UTC) X-FDA: 80067682926.04.67FBE77 Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by imf20.hostedemail.com (Postfix) with ESMTP id 733341C0011 for ; Thu, 27 Oct 2022 19:15:22 +0000 (UTC) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-13be3ef361dso3446747fac.12 for ; Thu, 27 Oct 2022 12:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Xmd8GXOVfbZSYxYq01AYUaxIegxLuQZMi2sQ8kS4z4o=; b=gSR6DQKBGvM3MOEzxUB5IKHBXxbtatGQxu1vnR+b5iXeLOGMg8DqWHvRy4izXyFPh/ a2SHVkWyPaIGLJ8WcCglUU4x8iJXahoEFb59xIpfLy379bF//G4oWRnhrEDYlMXwKE/p NFjnqQOtnieWFUffLphIzwQgTDUFVi1iG9WzXvM+utoFgsGyS2/F6nhC8sMSqSDDW8Ed VcRN7Cu52XgjdRVeejlN2HsvX4VKashJZ5T42CfJFa1iHQJfEItE+bpjzRPrei2ms4xM hPRR2SIwSoc8+9IyLsMaddg6z4jobWqmsvdi9aJdVnP0YhnYbLHE4dIiHJeGMz4QWtOE NJng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Xmd8GXOVfbZSYxYq01AYUaxIegxLuQZMi2sQ8kS4z4o=; b=3VvTmO9ec0qL3MGXu9EQuEaXmet+uniUXH7Rgp7Gn0mJurFTxbiOw1Jy7p+mlKqg34 XDc/Q2pDcERSFavc0sXNmtdBeP7nD2Cf98yDf1j6t68aR/b+riT9hoZef77cnmJITftF x8f2n/nTi1xAgcXqGygWgzREJ6hNgHd/KylqtFFcT8czIXs9tjq7pf9YgdaJtuomSQP4 /34Bs1xwlSvylh53vknoi0OMjAeQou9QQH8u5O85YiGG1y0FZdjH+8VRurS0Kq8aC27a Hjt7mK8oPU5PLYrTupYEgCvNFUNaDZu9sn6tnGc6b4lUYFzbsJMqqfuX7Kh2dEks3owa KnNw== X-Gm-Message-State: ACrzQf2XjKsH1LQdXcJAOH+XwtIsXS3SMXKQZ+w/UFEI98cS0jyN/aa6 NdrY/B6I7cO+Vm5gFnOFHfRle07JUxA+xVcI4E8= X-Google-Smtp-Source: AMsMyM4RnfjvpX2tSNs+QgqkzdKThEoIXWJYBuHJxHz2Llt16pfpt10u7Iy/8q7BZokoQKu0tRLxHlqnopAcbh2mDFg= X-Received: by 2002:a05:6870:c182:b0:12a:e54e:c6e8 with SMTP id h2-20020a056870c18200b0012ae54ec6e8mr6421188oad.207.1666898121794; Thu, 27 Oct 2022 12:15:21 -0700 (PDT) MIME-Version: 1.0 References: <20221025233421.you.825-kees@kernel.org> In-Reply-To: <20221025233421.you.825-kees@kernel.org> From: Andrey Konovalov Date: Thu, 27 Oct 2022 21:15:10 +0200 Message-ID: Subject: Re: [PATCH v3] mempool: Do not use ksize() for poisoning To: Kees Cook Cc: Vlastimil Babka , David Rientjes , Marco Elver , Vincenzo Frascino , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gSR6DQKB; spf=pass (imf20.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.160.45 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666898122; a=rsa-sha256; cv=none; b=sLIsSabN2gF/KbtzfytQOHfE8IF9xdckqHIjiwTqu/XsuOCZ13yEEWUqLS0EZGsfy87IC0 IP4OE5vcFNXcvq+PSCajAwo7jIWeJOjz3oi62zOf7oRySHQQsBVhZ9CrgPjr9MHjlaAXIX 4XMFTE68d5f2fj8Cl2WeMlw0x/mAQag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666898122; 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=Xmd8GXOVfbZSYxYq01AYUaxIegxLuQZMi2sQ8kS4z4o=; b=VGF0Sk4+P3a99u8ERtUVAxi/XF3TOWeEO7LPFpBaFSfClpkiOdNOKWLcLhh/0G1D6c9Dai apJHq13nJcd3qdTkdxBMH2V3KpG1RDKdmA/u+3AOxdj8nvR5VQfnXSF/YxM4v0Lnid8Kfb Z2PIglx0pwWcK9zZ0EOa92XhZh4L/3Y= X-Rspam-User: X-Rspamd-Queue-Id: 733341C0011 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gSR6DQKB; spf=pass (imf20.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.160.45 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: 6btcxurbnsp15seyre9hnhtqzs3ii675 X-Rspamd-Server: rspam10 X-HE-Tag: 1666898122-114276 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 Wed, Oct 26, 2022 at 1:36 AM Kees Cook wrote: > > Nothing appears to be using ksize() within the kmalloc-backed mempools > except the mempool poisoning logic. Use the actual pool size instead > of the ksize() to avoid needing any special handling of the memory as > needed by KASAN, UBSAN_BOUNDS, nor FORTIFY_SOURCE. > > Suggested-by: Vlastimil Babka > Link: https://lore.kernel.org/lkml/f4fc52c4-7c18-1d76-0c7a-4058ea2486b9@suse.cz/ > Cc: Andrey Konovalov > Cc: David Rientjes > Cc: Marco Elver > Cc: Vincenzo Frascino > Cc: Andrew Morton > Cc: linux-mm@kvack.org > Signed-off-by: Kees Cook > --- > v3: remove ksize() calls instead of adding kmalloc_roundup_size() calls (vbabka) > v2: https://lore.kernel.org/lkml/20221018090323.never.897-kees@kernel.org/ > v1: https://lore.kernel.org/lkml/20220923202822.2667581-14-keescook@chromium.org/ > --- > mm/mempool.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/mempool.c b/mm/mempool.c > index 96488b13a1ef..54204065037d 100644 > --- a/mm/mempool.c > +++ b/mm/mempool.c > @@ -58,7 +58,7 @@ static void check_element(mempool_t *pool, void *element) > { > /* Mempools backed by slab allocator */ > if (pool->free == mempool_free_slab || pool->free == mempool_kfree) { > - __check_element(pool, element, ksize(element)); > + __check_element(pool, element, (size_t)pool->pool_data); > } else if (pool->free == mempool_free_pages) { > /* Mempools backed by page allocator */ > int order = (int)(long)pool->pool_data; > @@ -81,7 +81,7 @@ static void poison_element(mempool_t *pool, void *element) > { > /* Mempools backed by slab allocator */ > if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) { > - __poison_element(element, ksize(element)); > + __poison_element(element, (size_t)pool->pool_data); > } else if (pool->alloc == mempool_alloc_pages) { > /* Mempools backed by page allocator */ > int order = (int)(long)pool->pool_data; > @@ -112,7 +112,7 @@ static __always_inline void kasan_poison_element(mempool_t *pool, void *element) > static void kasan_unpoison_element(mempool_t *pool, void *element) > { > if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) > - kasan_unpoison_range(element, __ksize(element)); > + kasan_unpoison_range(element, (size_t)pool->pool_data); > else if (pool->alloc == mempool_alloc_pages) > kasan_unpoison_pages(element, (unsigned long)pool->pool_data, > false); > -- > 2.34.1 > For the KASAN change: Reviewed-by: Andrey Konovalov Thanks!