From patchwork Sat Jul 1 06:44:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 114993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10879015vqr; Sat, 1 Jul 2023 00:13:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlHOpdoFzFmuji9taOguiI4mNeaYgYdn5boaKwTR0YQwMe8CDnf+0Jx86E993rEv8y8MkYbL X-Received: by 2002:a05:6359:684:b0:133:84c:a085 with SMTP id ei4-20020a056359068400b00133084ca085mr5020490rwb.1.1688195626388; Sat, 01 Jul 2023 00:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688195626; cv=none; d=google.com; s=arc-20160816; b=OoKjdgIwdhR1dtAv8ypJIPAHBmJ9M42Hcp5jDkctQf3Y9D/K+hPE4ju99jnfdejZ9C wHS/VekRXDWouQ64yGkssgAMYBn/Dtq3qIx56W7yK0TcsOCq4YauDbMPo8Ygzfg9adcZ tlXmKbxXLv0/0ywrtdoZew3Go+4wFCbo/OMqHO21OvvyazxNTspkn2gAomU4U7ki/fQ9 vuZUAmez/V8URw1wgxTZNbh68RvqjJ8SVa93foCfWz8iB8WYfL+YJV2ga0xSL8Hz2My+ Ua0+qRLF1charrwvqtlWlRoZygIEORUzeATTeomhZ8yDSGhmebeSFJoQUYiX+0MfwE07 KRQg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EAUdsAuBw2ZzQmr+g4bAaEosRmq0u2exwvQlueyY2MA=; fh=wXwvjL1Lqru7huHv9/iP27Tnw91N287OIvs7gJeCGH0=; b=wcef/m9Kl75cyvXachYV0tYewyYM313GvZlPUyqajJL7nHGxbdSo3zKxnYzf8NMIHO DNQlEEdwQ1uppCqiZ4RxDxB3mpUnEVRb+pk/Ubx/5GEqgpBGNOhvwesvcOk3q7TdSKQ2 PDcKchkPtACTb4CX9gUC2NOxklglAwm4MDpWnOYef7Gwvleu0H2RK+6W59iAB5oE9zL7 MYuJvbKJnyb6VEV7Scln1D0XMk0qIy2EMPj43iooLOJwy8lZ+9GSJmm3uc3w5Pm6kHsu iK+qCk1Bw1QNLtv0jH8jzlzScTISt0WRmfpIK50Onp+irfIEvwdXE6BkSZZsklomh2jJ wNYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dCledtXW; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i11-20020a17090332cb00b001b53dfb85c4si11577976plr.606.2023.07.01.00.13.31; Sat, 01 Jul 2023 00:13:46 -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=@kernel.org header.s=k20201202 header.b=dCledtXW; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229555AbjGAGv7 (ORCPT + 99 others); Sat, 1 Jul 2023 02:51:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229985AbjGAGvU (ORCPT ); Sat, 1 Jul 2023 02:51:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5266E55A7 for ; Fri, 30 Jun 2023 23:45:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6E1C760C85 for ; Sat, 1 Jul 2023 06:45:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6EC1C433C7; Sat, 1 Jul 2023 06:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688193903; bh=+VjO8L7CNRL1kWBXYJ2LUOmXcZ543o1WFIfIJyf4E94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dCledtXWs5vSc1zL+VXKhCk4dzqVxRNRbfB4B+ZOsIHpRAzSX+X3xiK9rEO64Vua6 hYd8y+zZXB1/21Y94R0ZhZjfawdFXNQftx3ACksReShPFFH54iUYrqKcH6xJT1ImfT PIXwBgl1xLzPUH6yW1waK21v0UTxGjkF6bgfjg4edJy80FqzP55q6Am2x5KGKS2bM0 0RKmPmYeK+OYp50CveY5Ey7zAamPWxNW0EVeuZqsHkfrkXt+nzfxlcAajH8ktiV1Bn eEu4Y1sbkd/IWlJE+vs3yl/lWJkUUaGArY2Ej/jkl5UhMYDrJIvKn5X5K/k21Rspk8 yOkPs4nbdFoOg== From: Christian Brauner To: Linus Torvalds Cc: Christian Brauner , Kees Cook , linux-kernel@vger.kernel.org Subject: [PATCH] pid: use struct_size_t() helper Date: Sat, 1 Jul 2023 08:44:44 +0200 Message-Id: <20230701-antrieb-rundbau-4b30efb507b2@brauner> X-Mailer: git-send-email 2.34.1 In-Reply-To: <202306300950.2BE7567101@keescook> References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2058; i=brauner@kernel.org; h=from:subject:message-id; bh=+VjO8L7CNRL1kWBXYJ2LUOmXcZ543o1WFIfIJyf4E94=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTMPx0sLvgpXC2Omd3tzO0T+/eKWs0rUpXpzOlVe9U66ej+ pk8GHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABPp2cTIMKtOlMeQ56WDmekPlu0am+ +U7ZRX50vIer12ZbD0kTr5Iob/+QnzGHY8tFq0fJPGDBVuFY0YE96yP/+4Ds58e2PTfevfXAA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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?1770201417217162857?= X-GMAIL-MSGID: =?utf-8?q?1770201417217162857?= Before commit d67790ddf021 ("overflow: Add struct_size_t() helper") only struct_size() existed, which expects a valid pointer instance containing the flexible array. However, when we determine the default struct pid allocation size for the associated kmem cache of a pid namespace we need to take the nesting depth of the pid namespace into account without an variable instance necessarily being available. In commit b69f0aeb0689 ("pid: Replace struct pid 1-element array with flex-array") we used to handle this the old fashioned way and cast NULL to a struct pid pointer type. However, we do apparently have a dedicated struct_size_t() helper for exactly this case. So switch to that. Suggested-by: Kees Cook Suggested-by: Linus Torvalds Signed-off-by: Christian Brauner --- kernel/pid.c | 2 +- kernel/pid_namespace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: a507db1d8fdc39802415e4d2ef6d1aecd67927fa diff --git a/kernel/pid.c b/kernel/pid.c index 8bce3aebc949..6a1d23a11026 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -657,7 +657,7 @@ void __init pid_idr_init(void) idr_init(&init_pid_ns.idr); init_pid_ns.pid_cachep = kmem_cache_create("pid", - struct_size((struct pid *)NULL, numbers, 1), + struct_size_t(struct pid, numbers, 1), __alignof__(struct pid), SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT, NULL); diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index 70a929784a5d..0bf44afe04dd 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -48,7 +48,7 @@ static struct kmem_cache *create_pid_cachep(unsigned int level) return kc; snprintf(name, sizeof(name), "pid_%u", level + 1); - len = struct_size((struct pid *)NULL, numbers, level + 1); + len = struct_size_t(struct pid, numbers, level + 1); mutex_lock(&pid_caches_mutex); /* Name collision forces to do allocation under mutex. */ if (!*pkc)