From patchwork Wed Apr 5 13:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 79655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp345115vqo; Wed, 5 Apr 2023 07:21:16 -0700 (PDT) X-Google-Smtp-Source: AKy350acqb3k+utlRWyapAKYXqTXAEYAR2vVVA6JwuW7zr2DzIXgUA3bHcEhEnygzoWgmOX2Ohhc X-Received: by 2002:a05:6a20:7523:b0:da:5ef4:69f5 with SMTP id r35-20020a056a20752300b000da5ef469f5mr4853745pzd.21.1680704476332; Wed, 05 Apr 2023 07:21:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680704476; cv=none; d=google.com; s=arc-20160816; b=TSg4sc5gcTmJUYoQzcsJthBkJ0pDBcBZNmNHJrqpiCrMVUAiJRfTxyyGjqLIcqJvya /ByBFBNFLbKPMVg41H4+X3SQ2x4KA+HNnhCZo98Ru8zlBN4B1tcTJNZkxASwVMX6E74V 9gTCNvQVgm6intbdrg1LQNkya3TTNms+7xfevYbdjg702TrMR2aLdBuMCWzCV+UV1Bog PGE+O/u+WMzvLtkORa6o4OFz7mxshrAwSAJadzYnDtrOj/RSKwI394V/j3T47/KztkFO oRoV9jdX9eBbQtCP9VR3H1UbSZRiSSc8cW/M2X7Wa5FZ+j70FSewIp4vVS0HhXZsUjBT N9ZA== 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; bh=vecJ8liaxAOeAjtJ/0BEdJGIEdMyyXbCMhngB9aENUI=; b=rT3nc8E1B7CNKqvRfYFqABCVvAvH1l0+nw94V9Yot43FunK9mWy9Zu/bnTmqLgmnYL bHQO6IauwiukmN0YjajcdoXP98BR99ECxLZbdAmML2i7PGmN6j9MAJZTGT+envy/dvcP w5zy/btL4lijmfLN+zSVLkFBc5KBE56M3BIzLwEBu7SMraTBrweG5bjVjAC6RwLqDDgJ ClLWRVGeZUoE0dynWAIyG36RZcO+n2PkF4CW7+L1OsDuG5C94q82p0CowA/2tNCuT0XO HQXn1kKmr7wtPEhhfT/XJSHQFwoG2UAgOCcD1Rn85yKoFI7pAZBiDHIclDxBMUgMY0AE ugwg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c134-20020a621c8c000000b0062ae6345c78si12632441pfc.403.2023.04.05.07.21.02; Wed, 05 Apr 2023 07:21:16 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238183AbjDEOBE (ORCPT + 99 others); Wed, 5 Apr 2023 10:01:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237218AbjDEOAz (ORCPT ); Wed, 5 Apr 2023 10:00:55 -0400 Received: from cloudserver094114.home.pl (cloudserver094114.home.pl [79.96.170.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C51759C4; Wed, 5 Apr 2023 07:00:46 -0700 (PDT) Received: from localhost (127.0.0.1) (HELO v370.home.net.pl) by /usr/run/smtp (/usr/run/postfix/private/idea_relay_lmtp) via UNIX with SMTP (IdeaSmtpServer 5.1.0) id 1656c586a3f367bf; Wed, 5 Apr 2023 16:00:44 +0200 Received: from kreacher.localnet (unknown [213.134.163.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by v370.home.net.pl (Postfix) with ESMTPSA id 114041B4EA5B; Wed, 5 Apr 2023 16:00:43 +0200 (CEST) From: "Rafael J. Wysocki" To: Linux ACPI Cc: LKML , Bob Moore , Kees Cook Subject: [PATCH 27/32] ACPICA: acpi_dmar_andd: Replace 1-element array with flexible array Date: Wed, 05 Apr 2023 15:55:13 +0200 Message-ID: <13264075.dW097sEU6C@kreacher> In-Reply-To: <4845957.31r3eYUQgx@kreacher> References: <4845957.31r3eYUQgx@kreacher> MIME-Version: 1.0 X-CLIENT-IP: 213.134.163.219 X-CLIENT-HOSTNAME: 213.134.163.219 X-VADE-SPAMSTATE: clean X-VADE-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvdejuddgjeduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecujffqoffgrffnpdggtffipffknecuuegrihhlohhuthemucduhedtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufffkfgjfhgggfgtsehtufertddttdejnecuhfhrohhmpedftfgrfhgrvghlucflrdcuhgihshhotghkihdfuceorhhjfiesrhhjfiihshhotghkihdrnhgvtheqnecuggftrfgrthhtvghrnhepledtieekkeekveeikeetgffgteeuteefjeevjeegudelvdduheeiuedvieehieevnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepvddufedrudefgedrudeifedrvdduleenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpedvudefrddufeegrdduieefrddvudelpdhhvghlohepkhhrvggrtghhvghrrdhlohgtrghlnhgvthdpmhgrihhlfhhrohhmpedftfgrfhgrvghlucflrdcuhgihshhotghkihdfuceorhhjfiesrhhjfiihshhotghkihdrnhgvtheqpdhnsggprhgtphhtthhopeegpdhrtghpthhtoheplhhinhhugidqrggtphhisehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoheprhhosggvrhhtrdhmohhorhgvsehinhhtvghlrdgtohhmpdhrtghpthhtohepkhgvvghssehouhht fhhluhigrdhnvght X-DCC--Metrics: v370.home.net.pl 1024; Body=4 Fuz1=4 Fuz2=4 X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_PASS 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?1762346376953526479?= X-GMAIL-MSGID: =?utf-8?q?1762346376953526479?= From: Kees Cook ACPICA commit 3c19ae70424e9ab1e1b805203d300d2660f9a2f7 Similar to "Replace one-element array with flexible-array", replace the 1-element array with a proper flexible array member as defined by C99. This allows the code to operate without tripping compile-time and run- time bounds checkers (e.g. via __builtin_object_size(), -fsanitize=bounds, and/or -fstrict-flex-arrays=3). The handling of struct acpi_dmar_andd by acpi_dm_dump_dmar() appears to expect a single trailing char for calculating table offsets. Keep a char in the union to avoid any code changes appearing in the .text or .data sections. Link: https://github.com/acpica/acpica/commit/3c19ae70 Signed-off-by: Kees Cook Signed-off-by: Bob Moore Signed-off-by: Rafael J. Wysocki --- include/acpi/actbl1.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 6ee7437537db..58b0490a2ad1 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -901,7 +901,10 @@ struct acpi_dmar_andd { struct acpi_dmar_header header; u8 reserved[3]; u8 device_number; - char device_name[1]; + union { + char __pad; + ACPI_FLEX_ARRAY(char, device_name); + }; }; /* 5: SOC Integrated Address Translation Cache Reporting Structure */