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 8AC83C32771 for ; Mon, 26 Sep 2022 18:24:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 255BF8E007C; Mon, 26 Sep 2022 14:24:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 206B28E0066; Mon, 26 Sep 2022 14:24:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A7898E007C; Mon, 26 Sep 2022 14:24:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EFD748E0066 for ; Mon, 26 Sep 2022 14:24:40 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9B5FB40B7C for ; Mon, 26 Sep 2022 18:24:40 +0000 (UTC) X-FDA: 79955062320.02.29660B8 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf20.hostedemail.com (Postfix) with ESMTP id 4F54E1C0020 for ; Mon, 26 Sep 2022 18:24:40 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id i6so3341707pfb.2 for ; Mon, 26 Sep 2022 11:24:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=4OBTQRXHJygCpY/2rBSvNKQlNNozBBa3mtJlOeJ/EyY=; b=cSzvTXKu85TucB7q+g9CQdjC/FdnYJW7ESEBDVMDQZhpqkoHzMT6tB5vmqaaVmtq+c HBo/BI5kdAn7jf+xxq5MiOLWI7cJumnHX29hS+SWLXo9wgZxYqgGZ4IjXwCG6/+UPFiS mSjP6/8kEubWj+KXOsoeUGGJwGHBMRMvzL4Ek= 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=4OBTQRXHJygCpY/2rBSvNKQlNNozBBa3mtJlOeJ/EyY=; b=1z3VOx2b4La2/GwrB531Krbx3EWjeI74gZhIhU/UDvwL+P2ZoMFsjgWLOyWLlB3s/w zmBiSdprxwsl3VafytxhKp8oVS+cX+bgoGzRel9n8OIJDQl/rx+11WOWpuBThrKb/3v3 wLDOA2gUfLD1yy4jjV/1Yx4ZBBiifmZ2FIyGPdBwvsZ25q0hLK1uAcFiPzg2QknnL6xr YffgU1rnQiKDKljSbn++o+rP2ked2oG9+u829kK7h6GFva0THSW/uaxsqBHnFLLIwEMM Moegkpk46q/lpGvY0gDC0Iv5Mp1YAIvMRdFd2mwstySxhH95yeAaqreAkoXk7Cewl8JE w+gA== X-Gm-Message-State: ACrzQf3c+Dft3A4XjaxUALkg+6XZWRsEgpnoOEL4hBMBZtCRtyovgz3Q QVPFbTsT0dBLFsZiBtuSVEmxLQ== X-Google-Smtp-Source: AMsMyM6gzz3RlLPDBF6eEAacYBSNNxOrYYdXLeQNzcYYWROPiLY1NScn4aUnW3BZuZbnjPt9v5tgLQ== X-Received: by 2002:a63:4750:0:b0:43c:dac:9e4b with SMTP id w16-20020a634750000000b0043c0dac9e4bmr21137736pgk.300.1664216679159; Mon, 26 Sep 2022 11:24:39 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id p2-20020a170902c70200b0016f85feae65sm11305644plp.87.2022.09.26.11.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 11:24:38 -0700 (PDT) Date: Mon, 26 Sep 2022 11:24:37 -0700 From: Kees Cook To: Vlastimil Babka Cc: Andrew Morton , linux-mm@kvack.org, "Ruhl, Michael J" , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Greg Kroah-Hartman , Nick Desaulniers , Alex Elder , Josef Bacik , David Sterba , Sumit Semwal , Christian =?iso-8859-1?Q?K=F6nig?= , Jesse Brandeburg , Daniel Micay , Yonghong Song , Marco Elver , Miguel Ojeda , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-fsdevel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, dev@openvswitch.org, x86@kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: Re: [PATCH v2 13/16] mempool: Use kmalloc_size_roundup() to match ksize() usage Message-ID: <202209261123.B2CBAE87E0@keescook> References: <20220923202822.2667581-1-keescook@chromium.org> <20220923202822.2667581-14-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=cSzvTXKu; spf=pass (imf20.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.178 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664216680; a=rsa-sha256; cv=none; b=ktMrdpJsBByJuYdGLriGQf8rekia1sw4QGPMO91qxyx71TUzwR+uS/eQwttg/VYBDFyWYy hd1sENdO4liZWJ6qxiItSY+paPTrUlQmPEt+G6HWihrAFEQKF/GJgAeMw68UHORzLhfWoy VDZBeDATJolmbWJHoWu7smP/OIsbJ3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664216680; 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=4OBTQRXHJygCpY/2rBSvNKQlNNozBBa3mtJlOeJ/EyY=; b=LyJcrZYohr9QAJnEtACM1pEQkTRMcKZUc7ciN6qNflZc0vDhHqeq+PKqM2j7gOoyAjFIWX TBtx36AZkLloNFpuGq8k01ijFyUtkFgp5rEblESkMQqJZFUmY73X6hvnWc376YU0R4tovo jjkAzyYoylKd8O6LMd9/oGipRUoTIks= X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 4F54E1C0020 X-Rspam-User: Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=cSzvTXKu; spf=pass (imf20.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.178 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Stat-Signature: c8ts44xeacgyihhqmt4ukhnho614jyad X-HE-Tag: 1664216680-144435 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 Mon, Sep 26, 2022 at 03:50:43PM +0200, Vlastimil Babka wrote: > On 9/23/22 22:28, Kees Cook wrote: > > Round up allocations with kmalloc_size_roundup() so that mempool's use > > of ksize() is always accurate and no special handling of the memory is > > needed by KASAN, UBSAN_BOUNDS, nor FORTIFY_SOURCE. > > > > Cc: Andrew Morton > > Cc: linux-mm@kvack.org > > Signed-off-by: Kees Cook > > --- > > mm/mempool.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/mm/mempool.c b/mm/mempool.c > > index 96488b13a1ef..0f3107b28e6b 100644 > > --- a/mm/mempool.c > > +++ b/mm/mempool.c > > @@ -526,7 +526,7 @@ EXPORT_SYMBOL(mempool_free_slab); > > */ > > void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data) > > { > > - size_t size = (size_t)pool_data; > > + size_t size = kmalloc_size_roundup((size_t)pool_data); > > Hm it is kinda wasteful to call into kmalloc_size_roundup for every > allocation that has the same input. We could do it just once in > mempool_init_node() for adjusting pool->pool_data ? > > But looking more closely, I wonder why poison_element() and > kasan_unpoison_element() in mm/mempool.c even have to use ksize()/__ksize() > and not just operate on the requested size (again, pool->pool_data). If no > kmalloc mempool's users use ksize() to write beyond requested size, then we > don't have to unpoison/poison that area either? Yeah, I think that's a fair point. I will adjust this. -- Kees Cook