Received: by 10.223.185.116 with SMTP id b49csp1027939wrg; Wed, 21 Feb 2018 10:49:41 -0800 (PST) X-Google-Smtp-Source: AH8x227QSyGZDYIOG8rSaXAdNrphyh310v0oGsPIWc1m0div3pY90E/f1fzwtlAQsYeinOO5Gi3a X-Received: by 10.98.68.129 with SMTP id m1mr4088184pfi.171.1519238981150; Wed, 21 Feb 2018 10:49:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519238981; cv=none; d=google.com; s=arc-20160816; b=wudQ9R623KYcDPl4RgHogIPiwGXUs8t+zG4alUIu0dnX/MV3TvQXvQGC41YE5cqL3S GSRJ8Q68J/Df9Q+CTnSQYoigdOOb5+ej6ZRhs1AshpMrWvAdib9S1QciPiS4DHWc2v+O S5M3PAxIr7sX6Y40O2MRhJRvXc+YIIW8AtaeMP+3t2O8hPWizy6e4XRLdgzxNPxTwDLU RNXW5FYs0DFJ3PKV0FzaotvyZN3KiB47rycwFnfRr/J6SRykv7K+ljCcHu9eim9uU8Cc hzjHY4XkxN3Sbevv7G0PdVlr9GiMhNNf4TQnGBi77VMBuP8i8e27aFDs62IEXnrqkHnR NOTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=yGHdZj3jvA/+pyYEet7cpbiFLHC+lpZR32+JunoDwoE=; b=E6oDUMx824JWNSjFoO/bT/z8HHQlfDKZTd0sBHQ9TUUyHA5Gx7OFKz0mS8scKZLpn4 3boa4yeelNMrI7H68mCJtuqxGZ/T1eFW/pcan0TznKnRX988wKPz+CZecQFLcE8xjeMr hhpyPc5tee2Ma2URChkP/ENYZRl3hlNvn+hY1AiXdvcjzCsXXFDkwxCD2sPoenBR4Jn8 7UOfVjdzE5Sh8XktoCzdJSD45l8ZvfSGJgxG/AoesoA7xCh9NwfjJ3QIzwcU9LEHGQB7 ffYqtamIqs0W9DqS/Wta7M35tEViA3/NSLz1iNFr23tL2JdEoMj0DcLvY6hY/HaLJHMd hP+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m68si1537449pgm.88.2018.02.21.10.49.27; Wed, 21 Feb 2018 10:49:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935857AbeBUOII (ORCPT + 99 others); Wed, 21 Feb 2018 09:08:08 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38666 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935508AbeBUNB5 (ORCPT ); Wed, 21 Feb 2018 08:01:57 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id C3C5C253; Wed, 21 Feb 2018 13:01:51 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ray Strode , Dave Airlie Subject: [PATCH 4.14 092/167] drm/qxl: unref cursor bo when finished with it Date: Wed, 21 Feb 2018 13:48:23 +0100 Message-Id: <20180221124529.402128391@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124524.639039577@linuxfoundation.org> References: <20180221124524.639039577@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ray Strode commit 16c6db3688734b27487a42d0c2a1062d0b2bad03 upstream. qxl_cursor_atomic_update allocs a bo for the cursor that it never frees up at the end of the function. This commit fixes that. Signed-off-by: Ray Strode Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/qxl/qxl_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -564,7 +564,7 @@ static void qxl_cursor_atomic_update(str struct qxl_cursor_cmd *cmd; struct qxl_cursor *cursor; struct drm_gem_object *obj; - struct qxl_bo *cursor_bo, *user_bo = NULL; + struct qxl_bo *cursor_bo = NULL, *user_bo = NULL; int ret; void *user_ptr; int size = 64*64*4; @@ -634,6 +634,8 @@ static void qxl_cursor_atomic_update(str qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false); qxl_release_fence_buffer_objects(release); + qxl_bo_unref(&cursor_bo); + return; out_backoff: