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 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 C0B5BC2D0DB for ; Tue, 28 Jan 2020 14:15:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BA3B24688 for ; Tue, 28 Jan 2020 14:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220957; bh=tycVKF0FxI+yOaoCkjgdxiNSkeT0/jFkUto3S4xIIfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yXztkQ74AjEeUxrf8qlVDgyPIWo2Y8ByQPS4DlNwbowE8twc6zoShdBaEFMSmZIU+ +1xMrHkhvY53ab7G7o8o6kVhFtsYTd38iP+E4OYUyH9Ei3QthplJYH0WMQOKlLKZux e6B+ZZZC2djWdtFFdCFaYSGGru1ynSCKvhZU9pK4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730221AbgA1OP4 (ORCPT ); Tue, 28 Jan 2020 09:15:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:38800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729232AbgA1OPx (ORCPT ); Tue, 28 Jan 2020 09:15:53 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 4EAFD24681; Tue, 28 Jan 2020 14:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220952; bh=tycVKF0FxI+yOaoCkjgdxiNSkeT0/jFkUto3S4xIIfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GQYV0tAUXhQu+H8BzwSbqMDNdj6P2HE1dttIm0IJ5nrJxVmWGPrmDWKW9KYB0OE5H lYpR5oVjWwYG8qndtL7ZxKPS1spJ+5EZeUKz58pxB4zON91OMRjwpJ5QRN4JUeTVzW m8h5QqJ+f+DPttBI4BZr3pBVVLUBgUg4Z8rYeQ8E= 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.9 004/271] drm/sti: do not remove the drm_bridge that was never added Date: Tue, 28 Jan 2020 15:02:33 +0100 Message-Id: <20200128135852.721847723@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 e7c243f708702..08808e3701de9 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -740,7 +740,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 376b0763c874a..a5412a6fbeca2 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -1352,7 +1352,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; } -- 2.20.1