From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3F6AC19F2A for ; Thu, 11 Aug 2022 16:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236665AbiHKQA2 (ORCPT ); Thu, 11 Aug 2022 12:00:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237236AbiHKQAE (ORCPT ); Thu, 11 Aug 2022 12:00:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1675ABD6A; Thu, 11 Aug 2022 08:48:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 509BC616F4; Thu, 11 Aug 2022 15:48:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF259C43141; Thu, 11 Aug 2022 15:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660232886; bh=5VONM8AZd/i5yhEdHC2G9D7p3qdxuKwqB16hmKffJ/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YX9fV2KqxB6GsKPQ3fY8UWtzIHOFYqCzGvW+rlSyY+bFOrQeyevMXF/eapWuX2G1Z dAq2Ch+fgykrynhrQswJBBx5RlqJu2nqppcnFNr9aRv+OHcERC2q1liuYEr/JX9C+Z IQV/IJjoW4/0cJwAoR9ygIpyKRBPYa7INJc2kCltp0gZI5qBI4iK/nTMAIb6dWCmmj kAUSppt1l9YATw0sFnoMXoAx9Ccup71VUS0+83LAW5tKoEBhK3dgjnzVMQmfwgkkWN qZSdymG9lYEdsffMaiPA3lLp3mA3dYcXOqsqd8QdNz6LkmfTBm8R0cl59IVC7kFv3U wTXngMy3cRAcQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicholas Kazlauskas , Michael Strauss , Rodrigo Siqueira , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, wyatt.wood@amd.com, aric.cyr@amd.com, meenakshikumar.somasundaram@amd.com, Jimmy.Kizito@amd.com, arnd@arndb.de, baihaowen@meizu.com, Jing.Zhou@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.18 52/93] drm/amd/display: Guard against ddc_pin being NULL for AUX Date: Thu, 11 Aug 2022 11:41:46 -0400 Message-Id: <20220811154237.1531313-52-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811154237.1531313-1-sashal@kernel.org> References: <20220811154237.1531313-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicholas Kazlauskas [ Upstream commit bc19909f19fdc8253d720d11c948935786fbfa08 ] [Why] In the case where we don't support DMUB aux but we have DPIA links in the configuration we might try to message AUX using the legacy path - where DDC pin is NULL. This causes a NULL pointer dereference. [How] Guard against NULL DDC pin, return a failure for aux engine acquire. Reviewed-by: Michael Strauss Acked-by: Rodrigo Siqueira Signed-off-by: Nicholas Kazlauskas Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c index 8e814000db62..5620a3345e4d 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c @@ -573,6 +573,11 @@ int dce_aux_transfer_raw(struct ddc_service *ddc, memset(&aux_req, 0, sizeof(aux_req)); memset(&aux_rep, 0, sizeof(aux_rep)); + if (ddc_pin == NULL) { + *operation_result = AUX_RET_ERROR_ENGINE_ACQUIRE; + return -1; + } + aux_engine = ddc->ctx->dc->res_pool->engines[ddc_pin->pin_data->en]; if (!acquire(aux_engine, ddc_pin)) { *operation_result = AUX_RET_ERROR_ENGINE_ACQUIRE; -- 2.35.1