From nobody Wed Apr 8 20:03:33 2026 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 374DFC4332F for ; Thu, 10 Nov 2022 13:48:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231213AbiKJNsF (ORCPT ); Thu, 10 Nov 2022 08:48:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231205AbiKJNsB (ORCPT ); Thu, 10 Nov 2022 08:48:01 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7DCB61745 for ; Thu, 10 Nov 2022 05:48:00 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id k8so2357100wrh.1 for ; Thu, 10 Nov 2022 05:48:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OLY2eEQFguZMIlY74s69pwkJXEOkjmvxBO7cb3VXH9s=; b=fhAPyBkyxhDKeTqg+JqZWQsY4umNf4sYfDnF8USCVvvFTZSNZHUo+JQvef272pkr1c 8I8aqC079tWCHZA/lNHvCzVqIvMVo51wS49wNbWWVRx9uR2UOaewRAcumne6bktPlaIL xez1MlDj8nAsglT7znRsVL3Il1ow8jY3Qxtv7oC1U3Emru5vkfr8gpyjcIGPPnAZ1Lac TB7xf61siUjU2WBFyXwRvlKoCO1ji6PdXb8xsSsjhGIuIMZ1bWfsKbYmjvZGHu5y2fe9 LI0JVeHIloPW2F/9uBZKAeupKYCh33DPq67V+ryoKT5YLPqFM1z6e3hKyjia1x8gVtk+ uvog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OLY2eEQFguZMIlY74s69pwkJXEOkjmvxBO7cb3VXH9s=; b=3ywfdC95kMM6FJU5L5qTWsvf3IVunTC4Np2x5wurCuzd3NHwZoB7oI8ZcbpJuZv6qD jO7bhCMTfK5OKU+40NwGTLCU1v2SoPM+M/i6qRp2pKRWnU3YSnOy4Yq3WK26wDNIECcE UI5cI66MthKkW4PTY23ovpyd78HgR/EJCPAYKQe4FCc1gwIbksDHSSaZFT2KRcCF+jBo kuAXF0raIORARikJiiyZ6agy37b0RPGiRjXzRIwd6rM0clP3JesZSkjFOL0SzEAxbR8t qx1X+r0NJ6j8379V5+hy5h5NyRyVxwLhalxZWwDvpG+SgWnRO340IB5PuB2UyKZfykck REtg== X-Gm-Message-State: ACrzQf1uHYJ2EJO5oAkl7ekhFSp8Jho9a1h5tJGpxqgKQtJ5+5qrom7M KTMMqV6SK48Gcc+DO5+Ni18= X-Google-Smtp-Source: AMsMyM6FTHfjKzU1+iMHW0JdWPMGdz7hTtjxHSpuh1O2USH3Dn1AglaEQKe2BBL0wK+BEiQTwrEwbw== X-Received: by 2002:a5d:5a17:0:b0:238:589f:e610 with SMTP id bq23-20020a5d5a17000000b00238589fe610mr885821wrb.42.1668088079216; Thu, 10 Nov 2022 05:47:59 -0800 (PST) Received: from localhost.localdomain ([94.73.35.109]) by smtp.gmail.com with ESMTPSA id h2-20020a5d4302000000b0022ae0965a8asm15717060wrq.24.2022.11.10.05.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 05:47:58 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: mripard@kernel.org Cc: emma@anholt.net, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v2 1/2] drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling() Date: Thu, 10 Nov 2022 14:47:51 +0100 Message-Id: <20221110134752.238820-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221110134752.238820-1-jose.exposito89@gmail.com> References: <20221110134752.238820-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify vc4_hdmi_supports_scrambling() by changing its first parameter from struct drm_encoder to struct vc4_hdmi. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vc4/vc4_hdmi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 0d78c800ed51..a49f88e5d2b9 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -124,9 +124,8 @@ static unsigned long long vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode, unsigned int bpc, enum vc4_hdmi_output_format fmt); =20 -static bool vc4_hdmi_supports_scrambling(struct drm_encoder *encoder) +static bool vc4_hdmi_supports_scrambling(struct vc4_hdmi *vc4_hdmi) { - struct vc4_hdmi *vc4_hdmi =3D encoder_to_vc4_hdmi(encoder); struct drm_display_info *display =3D &vc4_hdmi->connector.display_info; =20 lockdep_assert_held(&vc4_hdmi->mutex); @@ -321,7 +320,6 @@ static int vc4_hdmi_reset_link(struct drm_connector *co= nnector, { struct drm_device *drm =3D connector->dev; struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); - struct drm_encoder *encoder =3D &vc4_hdmi->encoder.base; struct drm_connector_state *conn_state; struct drm_crtc_state *crtc_state; struct drm_crtc *crtc; @@ -349,7 +347,7 @@ static int vc4_hdmi_reset_link(struct drm_connector *co= nnector, if (!crtc_state->active) return 0; =20 - if (!vc4_hdmi_supports_scrambling(encoder)) + if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) return 0; =20 scrambling_needed =3D vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adj= usted_mode, @@ -867,7 +865,7 @@ static void vc4_hdmi_enable_scrambling(struct drm_encod= er *encoder) =20 lockdep_assert_held(&vc4_hdmi->mutex); =20 - if (!vc4_hdmi_supports_scrambling(encoder)) + if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) return; =20 if (!vc4_hdmi_mode_needs_scrambling(mode, --=20 2.25.1 From nobody Wed Apr 8 20:03:33 2026 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 D3E4DC433FE for ; Thu, 10 Nov 2022 13:48:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231236AbiKJNsJ (ORCPT ); Thu, 10 Nov 2022 08:48:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231216AbiKJNsD (ORCPT ); Thu, 10 Nov 2022 08:48:03 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B8D76B3B3 for ; Thu, 10 Nov 2022 05:48:02 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id l14so2348105wrw.2 for ; Thu, 10 Nov 2022 05:48:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dFQJswkFzF6rVK/ySLw3u7BUeEqvWgS7HaoyjTUbHaU=; b=FbYEQ4sMHFTKTwrRg+TG7p4q/Sr4qC7TP+ZtXyuyZAo3X/0cPO8yi/3DZcDjiSJbmY W6IVpxLaN2Nh/907f6VE9WpUWDsacrmTcvjmaQbc1K3qvhJcBwH99WHeauqEFD6dTq9h A2hdmu9SQVRciA7r1JEnwzQwioxi3IkeYWz0h1oojcrY+tRWuHICQPJAxdettUko9BwS BdpYTJBNDjqTGO9eXrOAL2nwNNXzGmdqLsSCauwh9jgdgHxB5bPThosvesBkr9u06xUH FF2wdmAP8xn4m5Os2UWdRjTrewr45n02PBcTLjVrbW7F8Un9M4+4ThHm62SiSfwTgesf d48w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dFQJswkFzF6rVK/ySLw3u7BUeEqvWgS7HaoyjTUbHaU=; b=RymnMRauhq94YLaum1HqbbBu9CoCNAUgzYMeb1BHDzwYuI0ETxFKGcHxGm3eZwzImD gk9NXtHZdkJCLt1b6V0xhNXp4t2Ny3+3JfdzQ+xqhR/IXoJmxP6YNaO0ArnXUrGk3YbB Bf1g5A5MEbhnLtcvOZXTQZaLQNo5MkHLw1GE+jdmSN1Szn7L6MGfQbpLIuibnQB8YXP0 BX8VUNThxnlOSdRw/IhMJXobCW8ALy3mTvCrNTD/0X+Xw0Kus2+aK2Fkg/inM3BdM8v8 /Mt2tyoD2qVNdnwBK4B4I242vtiUzESrfLjYVNIraM8/JqKWUsszAsV67GW0cisxzmIX 5IyQ== X-Gm-Message-State: ACrzQf3R/xmyYUYqdubmcdH+pBaS3HGDnyMl+ChiN/e1HIPyp8B87yoX SOVHo9VTHSM33wVVOxD6RnQ= X-Google-Smtp-Source: AMsMyM7gP18kf7x+r2v5ySSaGrpwqLnSocitkDpa2Ir6vPYu4sHLNdb9K9bA9IMDJVsOH9kpsnIG3A== X-Received: by 2002:adf:e603:0:b0:236:80ac:5f4b with SMTP id p3-20020adfe603000000b0023680ac5f4bmr40517495wrm.83.1668088081038; Thu, 10 Nov 2022 05:48:01 -0800 (PST) Received: from localhost.localdomain ([94.73.35.109]) by smtp.gmail.com with ESMTPSA id h2-20020a5d4302000000b0022ae0965a8asm15717060wrq.24.2022.11.10.05.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 05:48:00 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: mripard@kernel.org Cc: emma@anholt.net, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v2 2/2] drm/vc4: hdmi: Fix pointer dereference before check Date: Thu, 10 Nov 2022 14:47:52 +0100 Message-Id: <20221110134752.238820-3-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221110134752.238820-1-jose.exposito89@gmail.com> References: <20221110134752.238820-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug") introduced the vc4_hdmi_reset_link() function. This function dereferences the "connector" pointer before checking whether it is NULL or not. Rework variable assignment to avoid this issue. Fixes: 6bed2ea3cb38 ("drm/vc4: hdmi: Reset link on hotplug") Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index a49f88e5d2b9..6b223a5fcf6f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -318,8 +318,8 @@ static int reset_pipe(struct drm_crtc *crtc, static int vc4_hdmi_reset_link(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx) { - struct drm_device *drm =3D connector->dev; - struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector); + struct drm_device *drm; + struct vc4_hdmi *vc4_hdmi; struct drm_connector_state *conn_state; struct drm_crtc_state *crtc_state; struct drm_crtc *crtc; @@ -330,6 +330,7 @@ static int vc4_hdmi_reset_link(struct drm_connector *co= nnector, if (!connector) return 0; =20 + drm =3D connector->dev; ret =3D drm_modeset_lock(&drm->mode_config.connection_mutex, ctx); if (ret) return ret; @@ -347,6 +348,7 @@ static int vc4_hdmi_reset_link(struct drm_connector *co= nnector, if (!crtc_state->active) return 0; =20 + vc4_hdmi =3D connector_to_vc4_hdmi(connector); if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) return 0; =20 --=20 2.25.1