From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 725DB21A445; Mon, 31 Mar 2025 14:34:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743431688; cv=none; b=DqK59EImH/Pg3Ffyg2C2J6MmX0nAkVPmQ3oR3TTrgJ2kmCq4rDx5K3jxb+9592KkDjEG6lcyxOXOk+802NOWcXXd6QRNgh4PQmLMUM7qYLxedslwWQASTvFP2mHEQw/lvlre9/EkGOUJLVly7IDG1U29NbG2574MZcRMIYyDA2w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743431688; c=relaxed/simple; bh=xaEMZxbQp1Qr9ivAjB59KF4a/0OwWMSbOUS1BmmeD7w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Mp+/jNS7nYwZuRSW7+fnQnQ7FN1+V40T18SWSNDv2KlmPYztBJCMCiyUsQrKILhxHsdfE2Mcyqx6XsVV6N/zxBejSDAFzQKbDCbO1HSVojK83EMdJAdBfSvNMr80jGnwHL+NfI/K/SbLfGEigum3xBHZJJyvS1eE7lKSs46wqys= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G1CHqkYu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G1CHqkYu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AE70C4CEE3; Mon, 31 Mar 2025 14:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743431686; bh=xaEMZxbQp1Qr9ivAjB59KF4a/0OwWMSbOUS1BmmeD7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G1CHqkYu8VyQ6OGBy8Dvy9fNGxOKxoF4NMamm0gRnOHuMkJwUrKvSXZuSiT5dN0yo P2XVwyJpWfS7+vyu5woRvafHCbicA2+sKmf55zgj10psIt+6CVu9YesyctLnQuDv2A apcn1zKBbxfRyEiHjXE7PXx/sCftvhwmEptLMxMfvPLKPGvFPf2tGWWd9jQPSc1q3R AUgMA+ED0kH7s0sIP1KyIUN88+mTUxMMvniweT3B2PYudefkDbR4GWqwOD0puvbxrw RcAUApTZu31XXoVEmLU2qQv2X4Lrw61VvZF/02GtLu6amSU8KS2Zv1uOMmel+RhpHd xFPKn3bxFT8xg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , xen-devel@lists.xenproject.org, Sasha Levin Subject: [PATCH AUTOSEL 6.14 15/18] xen/mcelog: Add __nonstring annotations for unterminated strings Date: Mon, 31 Mar 2025 10:34:05 -0400 Message-Id: <20250331143409.1682789-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250331143409.1682789-1-sashal@kernel.org> References: <20250331143409.1682789-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14 Content-Transfer-Encoding: 8bit From: Kees Cook [ Upstream commit 1c3dfc7c6b0f551fdca3f7c1f1e4c73be8adb17d ] When a character array without a terminating NUL character has a static initializer, GCC 15's -Wunterminated-string-initialization will only warn if the array lacks the "nonstring" attribute[1]. Mark the arrays with __nonstring to and correctly identify the char array as "not a C string" and thereby eliminate the warning. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1] Cc: Juergen Gross Cc: Stefano Stabellini Cc: Oleksandr Tyshchenko Cc: xen-devel@lists.xenproject.org Signed-off-by: Kees Cook Acked-by: Juergen Gross Message-ID: <20250310222234.work.473-kees@kernel.org> Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- include/xen/interface/xen-mca.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xen/interface/xen-mca.h b/include/xen/interface/xen-mca.h index 464aa6b3a5f92..1c9afbe8cc260 100644 --- a/include/xen/interface/xen-mca.h +++ b/include/xen/interface/xen-mca.h @@ -372,7 +372,7 @@ struct xen_mce { #define XEN_MCE_LOG_LEN 32 struct xen_mce_log { - char signature[12]; /* "MACHINECHECK" */ + char signature[12] __nonstring; /* "MACHINECHECK" */ unsigned len; /* = XEN_MCE_LOG_LEN */ unsigned next; unsigned flags; -- 2.39.5