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 41098152DF2; Thu, 1 Aug 2024 00:22:19 +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=1722471739; cv=none; b=d3OKmLwADWkVG8U4Slxp1dO19kdrZnGhFx0rMn8jHUHK1n+gydTvpCpOss4PzA8LYqpGNArHlA3dAAH6tAQKxmUnSmS+ei6jnI0f/SvtE2Fr4GVqsvPaggGh3IkjjHnf/sGLjIRD2pJXDsxGESAPn+phkQYtCUUMEEX0aMXtHm8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722471739; c=relaxed/simple; bh=HbCN9naIp8OwBp3UNbnPXtdvfBvYcGh5sjuFj/bYk6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gRHNckKR2OR+P2TQUlLoWFfTDvVcl0W2DSyREg+z7kLhG+Z4Qeb+x6CH75a26bKcPnPt3hDkc2x9rhWUlhbAoeRtdtXhh/HNhgCn8LqLR3p1TO+U2enbj8T9OyxqJIBaNX02ln1/pdrCcwtcCRl+E+Wnp+a1B/hur4eKAwrWQC4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TNVovXiF; 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="TNVovXiF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BF90C4AF0C; Thu, 1 Aug 2024 00:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722471739; bh=HbCN9naIp8OwBp3UNbnPXtdvfBvYcGh5sjuFj/bYk6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TNVovXiFUvzU/oMp3rdmmCx0YfsTIm35hxKElKrWhVhnuHZti8F+219zT80YdLpWM 0WLkxa5BxpUkIoEqRMY6AkCF2M8CoG87vM2CJmFX+mzIcUyQOu2Y5FZpTre/CHqm3n rzQNgag9wYbKr8r6zaPDz8fVhV/DeAsG4OTRLxWNJSEzk3Xa7ayZF6P9CmyX+QE3IZ T1xqBlRaLxtApdBor8ud3YqlSAey/D/X1+wAQvZ3DgPZn1+sA298jd+fkwSvDW4wbb vutZ8KjRWMip1uUShH2fZR+3LGaImG1d4sjRDK140XBo76bhwCoVoWasiazhbDaOgL Uac6vnX+V6I9g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Hung , Harry Wentland , Tom Chung , Daniel Wheeler , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, wayne.lin@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 14/83] drm/amd/display: Check msg_id before processing transcation Date: Wed, 31 Jul 2024 20:17:29 -0400 Message-ID: <20240801002107.3934037-14-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801002107.3934037-1-sashal@kernel.org> References: <20240801002107.3934037-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.6.43 Content-Transfer-Encoding: 8bit From: Alex Hung [ Upstream commit fa71face755e27dc44bc296416ebdf2c67163316 ] [WHY & HOW] HDCP_MESSAGE_ID_INVALID (-1) is not a valid msg_id nor is it a valid array index, and it needs checking before used. This fixes 4 OVERRUN issues reported by Coverity. Reviewed-by: Harry Wentland Acked-by: Tom Chung Signed-off-by: Alex Hung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c b/drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c index 25ffc052d53be..df2cb5279ce51 100644 --- a/drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c +++ b/drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c @@ -130,13 +130,21 @@ static bool hdmi_14_process_transaction( const uint8_t hdcp_i2c_addr_link_primary = 0x3a; /* 0x74 >> 1*/ const uint8_t hdcp_i2c_addr_link_secondary = 0x3b; /* 0x76 >> 1*/ struct i2c_command i2c_command; - uint8_t offset = hdcp_i2c_offsets[message_info->msg_id]; + uint8_t offset; struct i2c_payload i2c_payloads[] = { - { true, 0, 1, &offset }, + { true, 0, 1, 0 }, /* actual hdcp payload, will be filled later, zeroed for now*/ { 0 } }; + if (message_info->msg_id == HDCP_MESSAGE_ID_INVALID) { + DC_LOG_ERROR("%s: Invalid message_info msg_id - %d\n", __func__, message_info->msg_id); + return false; + } + + offset = hdcp_i2c_offsets[message_info->msg_id]; + i2c_payloads[0].data = &offset; + switch (message_info->link) { case HDCP_LINK_SECONDARY: i2c_payloads[0].address = hdcp_i2c_addr_link_secondary; @@ -310,6 +318,11 @@ static bool dp_11_process_transaction( struct dc_link *link, struct hdcp_protection_message *message_info) { + if (message_info->msg_id == HDCP_MESSAGE_ID_INVALID) { + DC_LOG_ERROR("%s: Invalid message_info msg_id - %d\n", __func__, message_info->msg_id); + return false; + } + return dpcd_access_helper( link, message_info->length, -- 2.43.0