From patchwork Tue Oct 25 23:36:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11004 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1275281wru; Tue, 25 Oct 2022 16:38:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ZuFVKQ48xz0SW8aU43arlJyL71KTTrJHFU7JQHlja6C03FER5ujcevilZTrj7B2wvwBR1 X-Received: by 2002:a63:a06:0:b0:458:2853:45e4 with SMTP id 6-20020a630a06000000b00458285345e4mr33972475pgk.20.1666741112516; Tue, 25 Oct 2022 16:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666741112; cv=none; d=google.com; s=arc-20160816; b=iNYs2mlrbGHtDk3dk5XloSps+MmVZgM5yDsnHA4npc8+Txi5CwZ5IwNKGjcxzdDgMh 05rDCXvsHtj2Lg7xXfEQ5tNYFBvVMvC6IgLFRKUDGR9Jl/QXDTGa9zUR8uS9xjvJ+vp3 yzyZ3Al4xeiKwPIOjWxVvGLOUXAVEXw7dODRXr/oP5ZcQ9bnscw815/2ZpCvc63biKI6 fWWFs/tD2dYDoH9JtS1v/NSaDKmyiRBIqqivOsHVhte3qJH/ZNEhqMu7SKt83kCR2BJ5 JFHeVODmQAJK3vh1h7kPExeeXs+GGNyD3XVlqN1AtWzMfuHHZqeK1jh1LjDpOdx8CIgT +XMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=AGtKXigXG9GEUy3d0vDj3qy0ftcRaftXZM1jOrI1Icc=; b=h5HVuwOLiMpvXrcBJiekMYmeI2PBn6xlLEWc8pvTcDLf2yzDjYskod6J5Z7Xeffnv9 wT/802pyjPR4EClfFOMCegSUpUBY4UPAcA9OiRHJw74a3lHdtLtnqOsmBBADYVSBUpm5 PjQ5cOCzoMH/aASWdttuco3O1xJBVzoQABTn98aEauy65Vf8p6eyL5KHI61ihONgeHOW GgbdLH/66gp46F1j3CYwNpOiCWLiSx/Jjt0cPx+D3iFBNrKf8D79lLITAR+FWi4JYlQI 3mGy7WrjPwVgqxzYJSd1A2s45yAgTQ60v/7WeBcNWoAJbaBBsRlo3Vd/xEVdt0nqXDTk Uxgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=dNQjW5t3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g1-20020a170902fe0100b00178a33faa42si4242179plj.66.2022.10.25.16.38.18; Tue, 25 Oct 2022 16:38:32 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=dNQjW5t3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232334AbiJYXga (ORCPT + 99 others); Tue, 25 Oct 2022 19:36:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231544AbiJYXg1 (ORCPT ); Tue, 25 Oct 2022 19:36:27 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 795DAF973B for ; Tue, 25 Oct 2022 16:36:26 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id p3so11442330pld.10 for ; Tue, 25 Oct 2022 16:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AGtKXigXG9GEUy3d0vDj3qy0ftcRaftXZM1jOrI1Icc=; b=dNQjW5t3D8tfppJYPI4FhUKWrCRWqRl5vraJjM+XSqyyGfsQCqbtXk/IzGLlout0kL 9rC8n0q9VaV2x87PLzOOrnQFXpT1q5NfhXz+WExks9ljvBvt4Y1Cu90Uf2nkHbjZsdwb AFh/N2qcgtcQTg3qkkF3HuHldDD8YYah0PSSA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AGtKXigXG9GEUy3d0vDj3qy0ftcRaftXZM1jOrI1Icc=; b=xQVV+xWJnQxsDDL9QthjimoNtYpSJV6eieZnge1gJ+PebBL/qx4C535gq1yUP9+Imu oWkUXbdzn6cl1zuUi+P7INhwd8bVHx+DEbxwSD2Ps/Ga5aJyZQ1CXOUhy4i55YD4TGTP ARTg1eoIwcvYALt2C8PeKbXqBaj17/06Ye2Y9ZFsJsu2Aya4HhUziv2OutloVywZoBzW 76m8A6Qit4Rvyd3PvHfMYgDqKutS0/088a2CWp6ldKkFXeBiw2QiVDUXZARI6fEWz7+e hXUzz6d5ZKJTbf3RI86FODiOZkBB9tYIPuAsJVWe1oW4rnCa01u+vk6RubtmjyVeMidj h0fQ== X-Gm-Message-State: ACrzQf0YzXGvm/zrZrhRmGZ6aoi/ntBrDH4EA2Rl7tESYCf5ITmqBdpu VDZ7iq7ZAXL1VPXL827uvgvouA== X-Received: by 2002:a17:90b:4c52:b0:20d:489b:5607 with SMTP id np18-20020a17090b4c5200b0020d489b5607mr883820pjb.40.1666740986031; Tue, 25 Oct 2022 16:36:26 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id j10-20020a170902da8a00b00186b5c1a715sm1697455plx.182.2022.10.25.16.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 16:36:25 -0700 (PDT) From: Kees Cook To: Vlastimil Babka Cc: Kees Cook , Andrey Konovalov , David Rientjes , Marco Elver , Vincenzo Frascino , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v3] mempool: Do not use ksize() for poisoning Date: Tue, 25 Oct 2022 16:36:22 -0700 Message-Id: <20221025233421.you.825-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2548; h=from:subject:message-id; bh=DzRLzcBQvhCrbv8dqqugqEjPL6g0B/ORdhfzQm5GdoI=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjWHL23XANz0fyOFVUEswQiVca2LWQjEpYhi04g7Qf yhp2li+JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY1hy9gAKCRCJcvTf3G3AJgJmD/ 0YsgEIllXxuFczQPOKT5OyXY2E91me/tQO8Z6Gu/9W2iMlsKclcMR9Rv4FAOtfHdgvDip4FLJOLJLc /CKVJKqpYcqOOgMNYRay9vB3WFaRROjtfbxaSRGuqYJaaKlAuMMN6SzsvGcYElMES2eZ5ehr1Z7JSv 0qXKGztFjZqHHEdCxKO4no9wkVm7H7jqcAFN8EnmfqFdTCmXdelGOjUP4QQaOG8HQzfIpTooL6O4lO GT5A3Z6HOoLpxQqP59yMR3MVnHEAMhrTnm2DtZjivUlnCGoTESBO+j6itl18bIgJyfTUIpGUbCAVT2 FNugjNDHkfvzwsObrx7H2wCEJl6IlvQhJ+3zUQD2RKOfhEhs59gKDmwWY2KvgPi7iIZLdkYG4iqYuC HdvUImlPGL34J+keBIuU5AqFua5IhXdCcbDkUuu21mtbAAjApTF5aEdGoxL7TMd1f/c/W+NHv1tIQI ZlMFK7WnxeUdJkvU2MdvWfmQQOQ8Bq4LOkNy5gVle6JSJiT8+rntb6gYRZPQ2F16KPELAwO41z8yRR pRowiBKTghX6N7f5WT7DJistKtwKeWYTPTU6rAQ39FNBx0X5jjLho1958siE1P41CmtPkIHp22AOlL sNopLfijMyInV7h6SkihdcGY+JLhZuH1blJP2c44Qzvf7Pb5St67DbTPx3mw== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747704729108068733?= X-GMAIL-MSGID: =?utf-8?q?1747704729108068733?= 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 Acked-by: Vlastimil Babka Reviewed-by: Andrey Konovalov --- 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);