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 CA0F01E566B; Thu, 1 Aug 2024 00:39:25 +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=1722472765; cv=none; b=l5tlztm8McktqMZ2S/THErXygb2wnxQe/6/yODN6GR3XxPyqSfeNQDuskmns053n8wNRDei6ltS8Rlfy0epZ+5O0BGs7W1OzyCXeuJeJjHph4x9+gWleYTw2XlkiN7+qJbuZbzHBg6xe2JRupKDIK5Cq0P8gl5+C7w5unh+QSWg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722472765; c=relaxed/simple; bh=e6tCVlq9Gha8Xqm80eYqImuzc4euvjwD/IBv0jKvKZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZQOWJ+oe6yNqm3cQNdAxHZ8DPfhESJcpsJK4L6SVduElno4MuP6bUQD9NRiZqJK7hEeFqT5YEPkceEbnUPcFqvz/TPhIunvHzPw2Oby796NHsm3RnyNo4omRpink5u9Li5bH1prq4B57QkwhPNQNTV25Yi7bLgM8uFygkw8ZjKg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c2dUSgsK; 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="c2dUSgsK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9DCDC116B1; Thu, 1 Aug 2024 00:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722472765; bh=e6tCVlq9Gha8Xqm80eYqImuzc4euvjwD/IBv0jKvKZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c2dUSgsK0l4JpfnC9HWfw2nrf14EMoMhFG+Mt3x5P3Uu5Ira8bfIekk6SGrtzo33M tuRkYym3YXUr5imaR8aJOxTFqEinro/Ngb8EZDQw1Bqk+tZycNZ6j3DSaG82Jh+E0T 2+haxPGrEkt2FZdCKDeCYLEXuRSWUtNyAqA7EXJxc/nAgUIGPlqrAVY+ut0EyhU32O /awbW7wgHN/qUTDbsaEE3P/QxT1ami46XuSUalvJhC+cx7W2RJgmChyOjL6pLR/fSg 09b0tYdNzmDQIm7qINaWPhp6wYvpKsXKTojsB1BYpljiEyMy45tjzyVzLC2ltV7nD4 nWiEtb+LrLLxQ== 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, hersenxs.wu@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 02/22] drm/amd/display: Check gpio_id before used as array index Date: Wed, 31 Jul 2024 20:38:31 -0400 Message-ID: <20240801003918.3939431-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801003918.3939431-1-sashal@kernel.org> References: <20240801003918.3939431-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 5.4.281 Content-Transfer-Encoding: 8bit From: Alex Hung [ Upstream commit 2a5626eeb3b5eec7a36886f9556113dd93ec8ed6 ] [WHY & HOW] GPIO_ID_UNKNOWN (-1) is not a valid value for array index and therefore should be checked in advance. This fixes 5 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/gpio/gpio_service.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c index 0be817f8cae6b..f76ec0dd29e7b 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c @@ -242,6 +242,9 @@ static bool is_pin_busy( enum gpio_id id, uint32_t en) { + if (id == GPIO_ID_UNKNOWN) + return false; + return service->busyness[id][en]; } @@ -250,6 +253,9 @@ static void set_pin_busy( enum gpio_id id, uint32_t en) { + if (id == GPIO_ID_UNKNOWN) + return; + service->busyness[id][en] = true; } @@ -258,6 +264,9 @@ static void set_pin_free( enum gpio_id id, uint32_t en) { + if (id == GPIO_ID_UNKNOWN) + return; + service->busyness[id][en] = false; } @@ -266,7 +275,7 @@ enum gpio_result dal_gpio_service_lock( enum gpio_id id, uint32_t en) { - if (!service->busyness[id]) { + if (id != GPIO_ID_UNKNOWN && !service->busyness[id]) { ASSERT_CRITICAL(false); return GPIO_RESULT_OPEN_FAILED; } @@ -280,7 +289,7 @@ enum gpio_result dal_gpio_service_unlock( enum gpio_id id, uint32_t en) { - if (!service->busyness[id]) { + if (id != GPIO_ID_UNKNOWN && !service->busyness[id]) { ASSERT_CRITICAL(false); return GPIO_RESULT_OPEN_FAILED; } -- 2.43.0