From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 227AE3C0613; Tue, 13 Oct 2026 09:12:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791882771; cv=none; b=XdXRENsHXbIFQPDC80c0p9Xqn739vnxylNmm/Z/uWxLClfCU/I21IjUhkgLAwfF+saRnpcsm2SBNF3eGZ0N/3BHh9JnuoHtx+8MXn0CiNfk/AmGicT/wXprW5Zf26IpK+h4Oakt/txtjXfNENcEoc0uCevEHsn1rQUd0cSEhTv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791882771; c=relaxed/simple; bh=2sI7JHnZN4RHQXIxOTtzWZLqGoC8MfMvUI2bkKF266o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BNiT821xXk97OmeHT825tdR2VHzkVobQktVnvwjU0HWo+OaYaMT1HK0KXzSriTsNTk0JF9JxJZwzBuzpi0YfhOY9Bi0+Ur+y3kKh6KRwN3S5jeGnAtMgm6I6m5PNendIvo31kSEG/qu+QPLrRVjHFKrWQZ8cSQ4d/AJCFTTFXQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gPgoXDyB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gPgoXDyB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 319C11F00893; Tue, 13 Oct 2026 09:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791882769; bh=NvcLXCxUDYQpUhcjBvEvjLcZ9pcSPtZX1HZ2Rfz6Ru4=; h=From:To:Cc:Subject:Date; b=gPgoXDyBD+rp1KWc0+pO6xElXQxdtUDTU3Cz36DIyENjslKLENe1b9//40UANgKuW 9EX6CEA7owc8ih93ZeAfviJ/h8nLc8xSHskKglmCOSqcDyHJPgW0ZDVAhitfTr9nsE 5sg3QLRnoF0wJeqI9rpHlwxR9nk+gZ/zZ7Uk0j0EtoE1FGAg59bmMTuuagkkTVl84p f/cvHjJUS76K2Zn5XbctBmZTryjwkuqiwUZEKtexJTVwNRQB4BlesJ6gaF3nN/m+yY +/kGMIoZCnR6Hjw81WQI+6Si5J2R1UT16SPFiXti3szCXoVY0OTXRyiJeubpphnzP4 2DpksaTehGDNg== From: Lee Jones To: lee@kernel.org, Jiri Kosina , Benjamin Tissoires , Vicki Pfau , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Dan Carpenter , Benjamin Tissoires Subject: [STABLE v6.1 1/6] HID: hid-steam: Fix cleanup in probe() Date: Tue, 13 Oct 2026 09:11:57 +0000 Message-ID: <20261013091204.529049-1-lee@kernel.org> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Dan Carpenter [ Upstream commit a9f1da09c69f13ef471db8b22107a28042d230ca ] There are a number of issues in this code. First of all if steam_create_client_hid() fails then it leads to an error pointer dereference when we call hid_destroy_device(steam->client_hdev). Also there are a number of leaks. hid_hw_stop() is not called if hid_hw_open() fails for example. And it doesn't call steam_unregister() or hid_hw_close(). Fixes: 691ead124a0c ("HID: hid-steam: Clean up locking") Signed-off-by: Dan Carpenter Reviewed-by: Vicki Pfau Link: https://lore.kernel.org/r/1fd87904-dabf-4879-bb89-72d13ebfc91e@moroto.mountain Signed-off-by: Benjamin Tissoires [Lee: Move client_hdev creation after steam_register() and omit mode_switch and rumble_work cancellation as 691ead124a0c and e133dc99fc07 are not present] Signed-off-by: Lee Jones --- drivers/hid/hid-steam.c | 43 ++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c index 8ee43cb225fc..2f5e9d3e6499 100644 --- a/drivers/hid/hid-steam.c +++ b/drivers/hid/hid-steam.c @@ -751,31 +751,20 @@ static int steam_probe(struct hid_device *hdev, INIT_WORK(&steam->work_connect, steam_work_connect_cb); INIT_LIST_HEAD(&steam->list); - steam->client_hdev = steam_create_client_hid(hdev); - if (IS_ERR(steam->client_hdev)) { - ret = PTR_ERR(steam->client_hdev); - goto client_hdev_fail; - } - steam->client_hdev->driver_data = steam; - /* * With the real steam controller interface, do not connect hidraw. * Instead, create the client_hid and connect that. */ ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDRAW); if (ret) - goto hid_hw_start_fail; - - ret = hid_add_device(steam->client_hdev); - if (ret) - goto client_hdev_add_fail; + goto err_cancel_work; ret = hid_hw_open(hdev); if (ret) { hid_err(hdev, "%s:hid_hw_open\n", __func__); - goto hid_hw_open_fail; + goto err_hw_stop; } if (steam->quirks & STEAM_QUIRK_WIRELESS) { @@ -791,19 +780,33 @@ static int steam_probe(struct hid_device *hdev, hid_err(hdev, "%s:steam_register failed with error %d\n", __func__, ret); - goto input_register_fail; + goto err_hw_close; } } + steam->client_hdev = steam_create_client_hid(hdev); + if (IS_ERR(steam->client_hdev)) { + ret = PTR_ERR(steam->client_hdev); + goto err_stream_unregister; + } + steam->client_hdev->driver_data = steam; + + ret = hid_add_device(steam->client_hdev); + if (ret) + goto err_destroy; + return 0; -input_register_fail: -hid_hw_open_fail: -client_hdev_add_fail: - hid_hw_stop(hdev); -hid_hw_start_fail: +err_destroy: hid_destroy_device(steam->client_hdev); -client_hdev_fail: +err_stream_unregister: + if (steam->connected) + steam_unregister(steam); +err_hw_close: + hid_hw_close(hdev); +err_hw_stop: + hid_hw_stop(hdev); +err_cancel_work: cancel_work_sync(&steam->work_connect); steam_alloc_fail: hid_err(hdev, "%s: failed with error %d\n", -- 2.56.0.385.gd3acb90ef8-goog