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 2463226A082; Wed, 23 Apr 2025 15:28:56 +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=1745422136; cv=none; b=ENNwx9ZUwsoAEUZt1uT7pzm8kuYwjINtCu94FCL5e49X5GxUfp/DdS2etSZHK+eY+gEVvGHUid0oOc7FXQmyOdUDoRu5dEv8fidi0JEBf43g6eW7w6qnyG9zN2co8P183MLEeZvovcI/ML7X0Ey3/v+UIiwWpr5pJ79xKuShPeg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745422136; c=relaxed/simple; bh=n+PnQ60bHxWr8yNW87b57I81Gsjp+YX1SVb0wLFgC/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HPVfCRudZyyxYhyCRR7SHKAIu2Wuwle1eyYfo6M1xuIUpQ3Z5VnoeLuDMBXpSGywsF87LrBksW51cd41bts/YNwVUFd9RfV4VXvoK1lRwcE+lAi0EJI9uM2EIaWZ2d0U+SXvJGrPy4h+KsdDoGKVSBkpPgbO5omxvfoBMqBy09k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x+sFS/u+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="x+sFS/u+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7A71C4CEE2; Wed, 23 Apr 2025 15:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745422136; bh=n+PnQ60bHxWr8yNW87b57I81Gsjp+YX1SVb0wLFgC/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x+sFS/u+tFBNgf482kdT3VEszwxoygScEQ0++YbhiE2MR+6RdlaNb1FtSl9w3Va/M ZueQrvja5qsVniAwyBfdZ8dm+2n3TB7PLKB59PzwwhSEAL8lznc6iTWVCogoUrjOxv ip6r4nLYENucy7RVBVW7fkZMSWvF1NGDiKbxIe0k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kees Cook , Nicolas Chauvet , Damian Tometzki , Zhenyu Wang , Jani Nikula Subject: [PATCH 6.1 243/291] drm/i915/gvt: fix unterminated-string-initialization warning Date: Wed, 23 Apr 2025 16:43:52 +0200 Message-ID: <20250423142634.350627783@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142624.409452181@linuxfoundation.org> References: <20250423142624.409452181@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jani Nikula commit 2e43ae7dd71cd9bb0d1bce1d3306bf77523feb81 upstream. Initializing const char opregion_signature[16] = OPREGION_SIGNATURE (which is "IntelGraphicsMem") drops the NUL termination of the string. This is intentional, but the compiler doesn't know this. Switch to initializing header->signature directly from the string litaral, with sizeof destination rather than source. We don't treat the signature as a string other than for initialization; it's really just a blob of binary data. Add a static assert for good measure to cross-check the sizes. Reported-by: Kees Cook Closes: https://lore.kernel.org/r/20250310222355.work.417-kees@kernel.org Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13934 Tested-by: Nicolas Chauvet Tested-by: Damian Tometzki Cc: stable@vger.kernel.org Reviewed-by: Zhenyu Wang Link: https://lore.kernel.org/r/20250327124739.2609656-1-jani.nikula@intel.com Signed-off-by: Jani Nikula (cherry picked from commit 4f8207469094bd04aad952258ceb9ff4c77b6bfa) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/gvt/opregion.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/i915/gvt/opregion.c +++ b/drivers/gpu/drm/i915/gvt/opregion.c @@ -222,7 +222,6 @@ int intel_vgpu_init_opregion(struct inte u8 *buf; struct opregion_header *header; struct vbt v; - const char opregion_signature[16] = OPREGION_SIGNATURE; gvt_dbg_core("init vgpu%d opregion\n", vgpu->id); vgpu_opregion(vgpu)->va = (void *)__get_free_pages(GFP_KERNEL | @@ -236,8 +235,10 @@ int intel_vgpu_init_opregion(struct inte /* emulated opregion with VBT mailbox only */ buf = (u8 *)vgpu_opregion(vgpu)->va; header = (struct opregion_header *)buf; - memcpy(header->signature, opregion_signature, - sizeof(opregion_signature)); + + static_assert(sizeof(header->signature) == sizeof(OPREGION_SIGNATURE) - 1); + memcpy(header->signature, OPREGION_SIGNATURE, sizeof(header->signature)); + header->size = 0x8; header->opregion_ver = 0x02000000; header->mboxes = MBOX_VBT;