From patchwork Thu Jun 15 01:18:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 108222 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp331849vqr; Wed, 14 Jun 2023 18:28:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6elOgERpgJhvRxZ1Ld3YhBwfAJ0qq2XkLnQFkbLISaLvil4tOUGpgF4C9LEg27vpbsLKJV X-Received: by 2002:a05:6830:130c:b0:6b1:655c:376 with SMTP id p12-20020a056830130c00b006b1655c0376mr14227116otq.7.1686792482877; Wed, 14 Jun 2023 18:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686792482; cv=none; d=google.com; s=arc-20160816; b=QWtCCndlKsoz1P/aNUUF3AMW+tHOuDIb+0i3DLn8crNrcKvgjEZQeZW2cM9AezqDWI qMaUIWefXuazXkh18Y9P5n+xRsCiycN3mJe/FedAhI69e3AhU472nTgX+g/yppIpZPB7 WRNQq6DNLjyF+H6xuSxa6Rnfpu7yk3Xh8qSs7HngJbPAGDylONxjAwljQRidvjSkkKuq 2vJFpF6LDS8q8vLV6WdS+PZei+GmtBj3BH+oVc1S7lsXvRK7vEOSVys8mg0w8lYDFIaw kMaxxPDa7IJMSGHyBleNd2690oVzMh0p4xn5myLi9SWxbOAmvQBmSzZNe2vkugquKGSp mdfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=XxoXnL+bw70ZmxVLmivme1pwYmJ7MC/4cNvFzhdFmC4=; b=vgyzuXULda8r0oIhZ3FoBtR1E0lLcIbZ4dZihV0S7qV8lUUhAzSPWoLWo59TeIqJu2 4fX1Qkbk9C02FYZaciR5ipbp+a5Skbn2gZJjL3tfX3BSJfEQN/jvIpSO4E/e2ONX/dp+ Ds3MpS7QiZW+9tv8vC7TFJTm3YF48ia+AbXIAW9v0Wo50HbmBEF87cwBJj1EGvpy3wiU Ee8UpBTCzA3kcJYkpmE+kdsBPRQ3iIv8ZqqBq6Dt2xfcfDS946WOPfL8paorLtzEDBvU u3RjsCE0yhfsLmtDM1P59ImtpE3QB65WnuvqD8FZ4RjgewgmYYuTc5SME9FA9/wo16SR KAEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LNn3r6Ss; 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 e1-20020a636901000000b005440b9f013csi8442317pgc.899.2023.06.14.18.27.49; Wed, 14 Jun 2023 18:28:02 -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=LNn3r6Ss; 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 S234359AbjFOBRa (ORCPT + 99 others); Wed, 14 Jun 2023 21:17:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbjFOBR1 (ORCPT ); Wed, 14 Jun 2023 21:17:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A3671FD2; Wed, 14 Jun 2023 18:17:26 -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 2DC8161200; Thu, 15 Jun 2023 01:17:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5D52C433C0; Thu, 15 Jun 2023 01:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686791845; bh=jC/V/5wTuDMjSNiSOnA5excD/Pg4jzWuQwRXLi7lZ5Q=; h=Date:From:To:Cc:Subject:From; b=LNn3r6SsDlIceMsugdzXzyHk9WrMjwzuxupyyplrVHyioNpMJdpql/gLeE+cky74M 7/gIN433a9Az+BryjDhdebV9l6Mnw4rB9+iqI6K5ce3PdjuOyjyiwgS3o4L1jcdmQY t9PY3TpynCOtMjyn4mXp6Wga7IIu/2AZoBsp29aMD6JYTeKrrQppEc0MFMTKtgNwMF krwRXUZxh2Vchb79SSKMEvvLrj7xm3Q1Tb5PktEXXLDaadwmoVq5AWvQv4qwKOV4hQ Rs0JFIB02Mjw2n30gUblEh4OxBCw19+eCBmlKcuJ9iIvOLsYjFdW3V8a5voebM/9Ed mRzHWmC4lfCxA== Date: Wed, 14 Jun 2023 19:18:22 -0600 From: "Gustavo A. R. Silva" To: Tejun Heo , Zefan Li , Johannes Weiner Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH][next] cgroup: Avoid -Wstringop-overflow warnings Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1768730114868703050?= X-GMAIL-MSGID: =?utf-8?q?1768730114868703050?= Address the following -Wstringop-overflow warnings seen when built with ARM architecture and aspeed_g4_defconfig configuration (notice that under this configuration CGROUP_SUBSYS_COUNT == 0): kernel/cgroup/cgroup.c:1208:16: warning: 'find_existing_css_set' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] kernel/cgroup/cgroup.c:1258:15: warning: 'css_set_hash' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] kernel/cgroup/cgroup.c:6089:18: warning: 'css_set_hash' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] kernel/cgroup/cgroup.c:6153:18: warning: 'css_set_hash' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] These changes are based on commit d20d30ebb199 ("cgroup: Avoid compiler warnings with no subsystems"). Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- kernel/cgroup/cgroup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index cd497b90e11a..1ee76e62eb98 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -1200,6 +1200,9 @@ static struct css_set *find_css_set(struct css_set *old_cset, unsigned long key; int ssid; + if (!CGROUP_HAS_SUBSYS_CONFIG) + return NULL; + lockdep_assert_held(&cgroup_mutex); /* First see if we already have a cgroup group that matches @@ -6045,6 +6048,9 @@ int __init cgroup_init(void) struct cgroup_subsys *ss; int ssid; + if (!CGROUP_HAS_SUBSYS_CONFIG) + return -EINVAL; + BUILD_BUG_ON(CGROUP_SUBSYS_COUNT > 16); BUG_ON(cgroup_init_cftypes(NULL, cgroup_base_files)); BUG_ON(cgroup_init_cftypes(NULL, cgroup_psi_files));