From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 7A6513BB12B for ; Thu, 30 Jul 2026 19:55:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785441358; cv=none; b=XAXEO3870C0Inn8qS6qymVaTPl9o+OejjPw+eAqsxHZ6U5mzDoThmAIikyz5cwWaAoF+uqwrL7L30JX2Tez54dxe7CU3B8dBh9eszW3UoOUXo4bQPY663lOwsbpBR65Y2v5YTeyOKMwIgy7tIBuo3Pa2WxfZZo9kGlzZ4ngYBxU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785441358; c=relaxed/simple; bh=oUwDNRCEkau9o5Osxc9z+qjauUeuAASLEAoFxFRKnQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QVGSlpc66mCvcnYvg8dOgoMsxSLWftvgHOvzTzWoO+c1N6WPpMqwjyEj/FE8g+VoOXoYouJ2po/hVKITpus2ntDZHFll5m7REjSTA0JAiRzgXvMTBi0QHYhnV50HYyFMuvuG8VdVqIQeXe2AkqOFKFxBNwrRKr0UJ+Au1WNuacY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=NKEZe5Vb; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NKEZe5Vb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785441356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/pz8u2PCNU3eOGp8lK0CAqX+n/JHdMOCrvaZNNO/A7E=; b=NKEZe5VbKgs3PcUowkovxQKnZziF6WOsdsNwzAi4EeLQW4QZIVOMRe0Hkzn37kPvQCYr1U 0ZhE1nQUmBBNj5uSKvu23Nx12sy79e0PyFrGJ4To+0XelxMqBbWw+6EFCxQZ2CUKqSe7x5 6tshRv+o1tq0J6glzGsUC7keShe2OqI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-35-zPNRc_WzMX2CG44a7SXSSQ-1; Thu, 30 Jul 2026 15:55:49 -0400 X-MC-Unique: zPNRc_WzMX2CG44a7SXSSQ-1 X-Mimecast-MFC-AGG-ID: zPNRc_WzMX2CG44a7SXSSQ_1785441347 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CAA58195609F; Thu, 30 Jul 2026 19:55:46 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.88.35]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 59EA4423; Thu, 30 Jul 2026 19:55:45 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Maarten Lankhorst" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Danilo Krummrich" , "Lyude Paul" Subject: [PATCH v2 1/5] drm/nouveau: Fix cleanup bug in nouveau_drm_device_new() Date: Thu, 30 Jul 2026 15:51:05 -0400 Message-ID: <20260730195523.1467423-2-lyude@redhat.com> In-Reply-To: <20260730195523.1467423-1-lyude@redhat.com> References: <20260730195523.1467423-1-lyude@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Sashiko caught this while reviewing the patches for enabling atomic by default. Trying to fix this properly would be a bit of a pain, and we're going to be adding another pre-DRM allocation here anyway. So, let's instead just convert the initial struct nouveau_drm allocation over to using devm so it is freed automatically. Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/nouveau_drm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 4d1ad718e09b7..9570850656126 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -723,7 +723,6 @@ nouveau_drm_device_del(struct nouveau_drm *drm) nvif_parent_dtor(&drm->parent); mutex_destroy(&drm->client_mutex); - kfree(drm); } static struct nouveau_drm * @@ -740,17 +739,15 @@ nouveau_drm_device_new(const struct drm_driver *drm_driver, struct device *paren struct nouveau_drm *drm; int ret; - drm = kzalloc_obj(*drm); + drm = devm_kzalloc(parent, sizeof(*drm), GFP_KERNEL); if (!drm) return ERR_PTR(-ENOMEM); drm->nvkm = device; drm->dev = drm_dev_alloc(drm_driver, parent); - if (IS_ERR(drm->dev)) { - ret = PTR_ERR(drm->dev); - goto done; - } + if (IS_ERR(drm->dev)) + return ERR_CAST(drm->dev); drm->dev->dev_private = drm; dev_set_drvdata(parent, drm); -- 2.55.0