From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B00178C67; Wed, 7 Aug 2024 15:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723043413; cv=none; b=FfpqwNskDtWoDmh+Fj0h0AF8Q9SOYC+wkYcSmGIvDnFBp5ye8ApeswDpwyuk2FgRAIVy9NZfVUbW+ljGTgHKyD/Kj6BXQyCXtzMbcwV5pfHgjuqBaqoyu0FXxzo1A+kZ4PvVG3hCogVdxXYSqCM+vyMGLGrWDQpSVliRvxUXxtQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723043413; c=relaxed/simple; bh=4xvovHONUfK0HFcUBhVEb8/H5kEXF6Q0eZaaV0/47xc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vBGk2zp+VtA1dIimM9f6pqKlvQ/LRqH4NRhp5gWwh6erSV9x0sWrnuDJXw0klaV1BGRZy7cjlPW3RK0lZaUfn80S3OPxF7z8g3WJ8Q1LuzGIy0vrieWtFQjlaHCc2gsKSARKaznjwCQEN0Do4jiGNbIkaeENz+dSORIkgBuWjhQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ur1+0EVp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ur1+0EVp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1D92C32781; Wed, 7 Aug 2024 15:10:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723043413; bh=4xvovHONUfK0HFcUBhVEb8/H5kEXF6Q0eZaaV0/47xc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ur1+0EVpdLMjFpVi6bfrAH619XRY8PZz2UDUDgNWTZksd+vEX51wB1ObrbSZpcpHz 0O7CDNKgW4xw2OoRvOTpzuToYa6sIYhBNV8ZVX/evkuqB8tXqHy5ucL+z1xMujIedR bCQFmMKDa68X+8GCgAm+mACdFIFAZ3fL/WPNq17g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ben Skeggs , =?UTF-8?q?Christian=20K=C3=B6nig?= , Danilo Krummrich , Sasha Levin Subject: [PATCH 6.6 053/121] drm/nouveau: prime: fix refcount underflow Date: Wed, 7 Aug 2024 16:59:45 +0200 Message-ID: <20240807150021.146986388@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240807150019.412911622@linuxfoundation.org> References: <20240807150019.412911622@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Danilo Krummrich [ Upstream commit a9bf3efc33f1fbf88787a277f7349459283c9b95 ] Calling nouveau_bo_ref() on a nouveau_bo without initializing it (and hence the backing ttm_bo) leads to a refcount underflow. Instead of calling nouveau_bo_ref() in the unwind path of drm_gem_object_init(), clean things up manually. Fixes: ab9ccb96a6e6 ("drm/nouveau: use prime helpers") Reviewed-by: Ben Skeggs Reviewed-by: Christian König Signed-off-by: Danilo Krummrich Link: https://patchwork.freedesktop.org/patch/msgid/20240718165959.3983-2-dakr@kernel.org (cherry picked from commit 1b93f3e89d03cfc576636e195466a0d728ad8de5) Signed-off-by: Danilo Krummrich Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_prime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 1b2ff0c40fc1c..6c599a9f49ee4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -64,7 +64,8 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, * to the caller, instead of a normal nouveau_bo ttm reference. */ ret = drm_gem_object_init(dev, &nvbo->bo.base, size); if (ret) { - nouveau_bo_ref(NULL, &nvbo); + drm_gem_object_release(&nvbo->bo.base); + kfree(nvbo); obj = ERR_PTR(-ENOMEM); goto unlock; } -- 2.43.0