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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 A4D50C43387 for ; Wed, 16 Jan 2019 20:38:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 713CC206C2 for ; Wed, 16 Jan 2019 20:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732815AbfAPUiP (ORCPT ); Wed, 16 Jan 2019 15:38:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46576 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732738AbfAPUiL (ORCPT ); Wed, 16 Jan 2019 15:38:11 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CCB44A1718; Wed, 16 Jan 2019 20:38:11 +0000 (UTC) Received: from malachite.bss.redhat.com (dhcp-10-20-1-11.bss.redhat.com [10.20.1.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id B24F15DE8B; Wed, 16 Jan 2019 20:38:10 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , David Airlie , Harry Wentland , Maarten Lankhorst , Maxime Ripard , Sean Paul , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] drm/dp_mst: Fix potential topology ref leak in drm_dp_atomic_find_vcpi_slots() Date: Wed, 16 Jan 2019 15:37:58 -0500 Message-Id: <20190116203759.31820-3-lyude@redhat.com> In-Reply-To: <20190116203759.31820-1-lyude@redhat.com> References: <20190116203759.31820-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 16 Jan 2019 20:38:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a very minute issue I introduced that I just noticed when scrolling through drm_dp_mst_topology.c: if a driver uses drm_dp_atomic_find_vcpi_slots() incorrectly, we'll forget to release the topology reference we grabbed on port. So, fix this by jumping to 'out' instead of returning -EINVAL immediately. Signed-off-by: Lyude Paul Fixes: eceae1472467 ("drm/dp_mst: Start tracking per-port VCPI allocations") Cc: Daniel Vetter Cc: David Airlie Cc: Harry Wentland Signed-off-by: Lyude Paul --- drivers/gpu/drm/drm_dp_mst_topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 49575b80caeb..d99560c5c693 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3070,7 +3070,8 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, if (WARN_ON(!prev_slots)) { DRM_ERROR("cannot allocate and release VCPI on [MST PORT:%p] in the same state\n", port); - return -EINVAL; + ret = -EINVAL; + goto out; } break; -- 2.20.1