From patchwork Fri Jan 24 09:27:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5FA8C35242 for ; Fri, 24 Jan 2020 09:37:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF5CF214AF for ; Fri, 24 Jan 2020 09:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858622; bh=Rrqe7ejAryiIqd9awB6PJw/1Zp0z4ZCycenF2+Lb2Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0Kw/Dg0H+jCnmKP80nHYjK07tltlLX++X4LEPcOxYTHy+dsy407plsG1NIQKoVKKW VJyHlrGhkSJYqPPYAdlZ87K7ShWJaCxGMgQhTjl3s/ysl1HPZ77PWrKpwzucGpWLES a/0OPNuHhG4FhadH/4ngT9rrCezvv2z0qwnNy4u0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730743AbgAXJhC (ORCPT ); Fri, 24 Jan 2020 04:37:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:34424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726695AbgAXJhB (ORCPT ); Fri, 24 Jan 2020 04:37:01 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1F0082087E; Fri, 24 Jan 2020 09:36:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858620; bh=Rrqe7ejAryiIqd9awB6PJw/1Zp0z4ZCycenF2+Lb2Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TZrnijaFrg92FrPduCnU0IUW0rV30PGazxMzee2ePhLQzCEPn1WczxFmbkIaRNu7b MYLBUnfvZjcsuOcDVMk7E9+Tq6s+dAbP0SSbvh5eWW5rAasWpzYUBINtqq1iBrVtzk nnv5gP3gfi9YSKcWJz9T4kfI7fE2fJ9stbyh4MHs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Vetter , Peter Rosin , Benjamin Gaignard , Sasha Levin Subject: [PATCH 4.14 008/343] drm/sti: do not remove the drm_bridge that was never added Date: Fri, 24 Jan 2020 10:27:06 +0100 Message-Id: <20200124092920.697583951@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Rosin [ Upstream commit 66e31a72dc38543b2d9d1ce267dc78ba9beebcfd ] Removing the drm_bridge_remove call should avoid a NULL dereference during list processing in drm_bridge_remove if the error path is ever taken. The more natural approach would perhaps be to add a drm_bridge_add, but there are several other bridges that never call drm_bridge_add. Just removing the drm_bridge_remove is the easier fix. Fixes: 84601dbdea36 ("drm: sti: rework init sequence") Acked-by: Daniel Vetter Signed-off-by: Peter Rosin Signed-off-by: Benjamin Gaignard Link: https://patchwork.freedesktop.org/patch/msgid/20180806061910.29914-2-peda@axentia.se Signed-off-by: Sasha Levin --- drivers/gpu/drm/sti/sti_hda.c | 1 - drivers/gpu/drm/sti/sti_hdmi.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index cf65e32b5090a..0399bb18d3872 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -721,7 +721,6 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data) return 0; err_sysfs: - drm_bridge_remove(bridge); return -EINVAL; } diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 30f02d2fdd034..bbb195a92e93f 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -1314,7 +1314,6 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data) return 0; err_sysfs: - drm_bridge_remove(bridge); hdmi->drm_connector = NULL; return -EINVAL; }