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 990FC248BC1; Wed, 15 Jan 2025 10:51:59 +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=1736938319; cv=none; b=m7Tz6uH7G7ngDlfEADpmrvVEi68wxpcumWq22ZMZLAahtf4mRK5GrloXhIE6//Y7DHOEyi74dTonbFb9HHuQguc5waaege7aKnXJ6ktOGAmHxPQ7tYJOJ/AAdSQSJxfF/E39DSEcCBQgyEp9/V/kjA1Pepw/ClIld1fqVKDGQJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736938319; c=relaxed/simple; bh=tSoPxCGYbrkhtJqmz8MJs5AFvtT8oreoTm/Ru2urNT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q9DDahMjtauiz+jZHzCpZM/9/g/dc2xL7d3fHNWh2qSh9hSNZxJe+K+nsgVsRofiTvD20tGulDlwhHYVTR8tUYE+UpPQemuGXNMMVZ0gL8IHWhVY83ktU8I5iRAKDDGasijdYbrwiEdQgaQ4TDNXFgPCaRawbdlBRgOFvLaEwM8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KDp+P0hF; 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="KDp+P0hF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 047D6C4CEDF; Wed, 15 Jan 2025 10:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736938319; bh=tSoPxCGYbrkhtJqmz8MJs5AFvtT8oreoTm/Ru2urNT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KDp+P0hFtGrLOKe7o4JDgtKm3nRVgy24aofyyvajKniQOwa0cONox82HHHSEk9P3L hQreflBnURwMvNRaYiBDUDhU22hSupTnISDK6UPskY+LtDLOmF+jTnb3TJiuAdRr26 uMzaV6HZAJhmT5IMTzWbywAm3Y4bi5hT/T/M4l00= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Ma Ke , Alan Stern Subject: [PATCH 6.12 147/189] usb: fix reference leak in usb_new_device() Date: Wed, 15 Jan 2025 11:37:23 +0100 Message-ID: <20250115103612.284572548@linuxfoundation.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250115103606.357764746@linuxfoundation.org> References: <20250115103606.357764746@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ma Ke commit 0df11fa8cee5a9cf8753d4e2672bb3667138c652 upstream. When device_add(&udev->dev) succeeds and a later call fails, usb_new_device() does not properly call device_del(). As comment of device_add() says, 'if device_add() succeeds, you should call device_del() when you want to get rid of it. If device_add() has not succeeded, use only put_device() to drop the reference count'. Found by code review. Cc: stable Fixes: 9f8b17e643fe ("USB: make usbdevices export their device nodes instead of using a separate class") Signed-off-by: Ma Ke Reviewed-by: Alan Stern Link: https://lore.kernel.org/r/20241218071346.2973980-1-make_ruc2021@163.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/hub.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2663,13 +2663,13 @@ int usb_new_device(struct usb_device *ud err = sysfs_create_link(&udev->dev.kobj, &port_dev->dev.kobj, "port"); if (err) - goto fail; + goto out_del_dev; err = sysfs_create_link(&port_dev->dev.kobj, &udev->dev.kobj, "device"); if (err) { sysfs_remove_link(&udev->dev.kobj, "port"); - goto fail; + goto out_del_dev; } if (!test_and_set_bit(port1, hub->child_usage_bits)) @@ -2683,6 +2683,8 @@ int usb_new_device(struct usb_device *ud pm_runtime_put_sync_autosuspend(&udev->dev); return err; +out_del_dev: + device_del(&udev->dev); fail: usb_set_device_state(udev, USB_STATE_NOTATTACHED); pm_runtime_disable(&udev->dev);