|
Oliver Neukum |
d9a137 |
From c7dd13805f8b8fc1ce3b6d40f6aff47e66b72ad2 Mon Sep 17 00:00:00 2001
|
|
Oliver Neukum |
d9a137 |
From: Szymon Heidrich <szymon.heidrich@gmail.com>
|
|
Oliver Neukum |
d9a137 |
Date: Tue, 3 Jan 2023 10:17:09 +0100
|
|
Oliver Neukum |
d9a137 |
Subject: [PATCH] usb: rndis_host: Secure rndis_query check against int
|
|
Oliver Neukum |
d9a137 |
overflow
|
|
Oliver Neukum |
d9a137 |
Git-commit: c7dd13805f8b8fc1ce3b6d40f6aff47e66b72ad2
|
|
Oliver Neukum |
d9a137 |
References: CVE-2023-23559 bsc#1207051
|
|
Oliver Neukum |
d9a137 |
Patch-mainline: v6.2-rc3
|
|
Oliver Neukum |
d9a137 |
|
|
Oliver Neukum |
d9a137 |
Variables off and len typed as uint32 in rndis_query function
|
|
Oliver Neukum |
d9a137 |
are controlled by incoming RNDIS response message thus their
|
|
Oliver Neukum |
d9a137 |
value may be manipulated. Setting off to a unexpectetly large
|
|
Oliver Neukum |
d9a137 |
value will cause the sum with len and 8 to overflow and pass
|
|
Oliver Neukum |
d9a137 |
the implemented validation step. Consequently the response
|
|
Oliver Neukum |
d9a137 |
pointer will be referring to a location past the expected
|
|
Oliver Neukum |
d9a137 |
buffer boundaries allowing information leakage e.g. via
|
|
Oliver Neukum |
d9a137 |
RNDIS_OID_802_3_PERMANENT_ADDRESS OID.
|
|
Oliver Neukum |
d9a137 |
|
|
Oliver Neukum |
d9a137 |
Fixes: ddda08624013 ("USB: rndis_host, various cleanups")
|
|
Oliver Neukum |
d9a137 |
Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com>
|
|
Oliver Neukum |
d9a137 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Oliver Neukum |
d9a137 |
Signed-off-by: Oliver Neukum <oneukum@suse.com>
|
|
Oliver Neukum |
d9a137 |
---
|
|
Oliver Neukum |
d9a137 |
drivers/net/usb/rndis_host.c | 3 ++-
|
|
Oliver Neukum |
d9a137 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
Oliver Neukum |
d9a137 |
|
|
Oliver Neukum |
d9a137 |
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
|
|
Oliver Neukum |
d9a137 |
index f79333fe1783..7b3739b29c8f 100644
|
|
Oliver Neukum |
d9a137 |
--- a/drivers/net/usb/rndis_host.c
|
|
Oliver Neukum |
d9a137 |
+++ b/drivers/net/usb/rndis_host.c
|
|
Oliver Neukum |
d9a137 |
@@ -255,7 +255,8 @@ static int rndis_query(struct usbnet *dev, struct usb_interface *intf,
|
|
Oliver Neukum |
d9a137 |
|
|
Oliver Neukum |
d9a137 |
off = le32_to_cpu(u.get_c->offset);
|
|
Oliver Neukum |
d9a137 |
len = le32_to_cpu(u.get_c->len);
|
|
Oliver Neukum |
d9a137 |
- if (unlikely((8 + off + len) > CONTROL_BUFFER_SIZE))
|
|
Oliver Neukum |
d9a137 |
+ if (unlikely((off > CONTROL_BUFFER_SIZE - 8) ||
|
|
Oliver Neukum |
d9a137 |
+ (len > CONTROL_BUFFER_SIZE - 8 - off)))
|
|
Oliver Neukum |
d9a137 |
goto response_error;
|
|
Oliver Neukum |
d9a137 |
|
|
Oliver Neukum |
d9a137 |
if (*reply_len != -1 && len != *reply_len)
|
|
Oliver Neukum |
d9a137 |
--
|
|
Oliver Neukum |
d9a137 |
2.39.1
|
|
Oliver Neukum |
d9a137 |
|