* [PATCH 1/1] HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
@ 2022-07-08 7:40 Lee Jones
2022-07-19 15:43 ` Lee Jones
2022-08-25 8:22 ` Jiri Kosina
0 siblings, 2 replies; 3+ messages in thread
From: Lee Jones @ 2022-07-08 7:40 UTC (permalink / raw)
To: lee.jones; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, linux-input
It is possible for a malicious device to forgo submitting a Feature
Report. The HID Steam driver presently makes no prevision for this
and de-references the 'struct hid_report' pointer obtained from the
HID devices without first checking its validity. Let's change that.
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org
Fixes: c164d6abf3841 ("HID: add driver for Valve Steam Controller")
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/hid/hid-steam.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
index a3b151b29bd71..fc616db4231bb 100644
--- a/drivers/hid/hid-steam.c
+++ b/drivers/hid/hid-steam.c
@@ -134,6 +134,11 @@ static int steam_recv_report(struct steam_device *steam,
int ret;
r = steam->hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0];
+ if (!r) {
+ hid_err(steam->hdev, "No HID_FEATURE_REPORT submitted - nothing to read\n");
+ return -EINVAL;
+ }
+
if (hid_report_len(r) < 64)
return -EINVAL;
@@ -165,6 +170,11 @@ static int steam_send_report(struct steam_device *steam,
int ret;
r = steam->hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0];
+ if (!r) {
+ hid_err(steam->hdev, "No HID_FEATURE_REPORT submitted - nothing to read\n");
+ return -EINVAL;
+ }
+
if (hid_report_len(r) < 64)
return -EINVAL;
--
2.37.0.rc0.161.g10f37bed90-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
2022-07-08 7:40 [PATCH 1/1] HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report Lee Jones
@ 2022-07-19 15:43 ` Lee Jones
2022-08-25 8:22 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2022-07-19 15:43 UTC (permalink / raw)
To: linux-kernel, Jiri Kosina, Benjamin Tissoires, linux-input
On Fri, 08 Jul 2022, Lee Jones wrote:
> It is possible for a malicious device to forgo submitting a Feature
> Report. The HID Steam driver presently makes no prevision for this
> and de-references the 'struct hid_report' pointer obtained from the
> HID devices without first checking its validity. Let's change that.
>
> Cc: Jiri Kosina <jikos@kernel.org>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> Cc: linux-input@vger.kernel.org
> Fixes: c164d6abf3841 ("HID: add driver for Valve Steam Controller")
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/hid/hid-steam.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
Did anyone get a chance to look at this?
Would you like me to submit a [RESEND]?
> diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
> index a3b151b29bd71..fc616db4231bb 100644
> --- a/drivers/hid/hid-steam.c
> +++ b/drivers/hid/hid-steam.c
> @@ -134,6 +134,11 @@ static int steam_recv_report(struct steam_device *steam,
> int ret;
>
> r = steam->hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0];
> + if (!r) {
> + hid_err(steam->hdev, "No HID_FEATURE_REPORT submitted - nothing to read\n");
> + return -EINVAL;
> + }
> +
> if (hid_report_len(r) < 64)
> return -EINVAL;
>
> @@ -165,6 +170,11 @@ static int steam_send_report(struct steam_device *steam,
> int ret;
>
> r = steam->hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0];
> + if (!r) {
> + hid_err(steam->hdev, "No HID_FEATURE_REPORT submitted - nothing to read\n");
> + return -EINVAL;
> + }
> +
> if (hid_report_len(r) < 64)
> return -EINVAL;
>
--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
2022-07-08 7:40 [PATCH 1/1] HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report Lee Jones
2022-07-19 15:43 ` Lee Jones
@ 2022-08-25 8:22 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2022-08-25 8:22 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-kernel, Benjamin Tissoires, linux-input
On Fri, 8 Jul 2022, Lee Jones wrote:
> It is possible for a malicious device to forgo submitting a Feature
> Report. The HID Steam driver presently makes no prevision for this
> and de-references the 'struct hid_report' pointer obtained from the
> HID devices without first checking its validity. Let's change that.
>
> Cc: Jiri Kosina <jikos@kernel.org>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> Cc: linux-input@vger.kernel.org
> Fixes: c164d6abf3841 ("HID: add driver for Valve Steam Controller")
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Sorry for the delay, I had some time off and things got stalled. Applied
now, thank you.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-25 8:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-08 7:40 [PATCH 1/1] HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report Lee Jones
2022-07-19 15:43 ` Lee Jones
2022-08-25 8:22 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).