mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From bda1fb82d50ddd35354d850456e687da43bcd794 Mon Sep 17 00:00:00 2001
|
|
From: Ignat Korchagin <ignat.korchagin@gmail.com>
|
|
Date: Thu, 17 Mar 2016 18:00:29 +0000
|
|
Subject: USB: usbip: fix potential out-of-bounds write
|
|
|
|
Fix potential out-of-bounds write to urb->transfer_buffer
|
|
usbip handles network communication directly in the kernel. When receiving a
|
|
packet from its peer, usbip code parses headers according to protocol. As
|
|
part of this parsing urb->actual_length is filled. Since the input for
|
|
urb->actual_length comes from the network, it should be treated as untrusted.
|
|
Any entity controlling the network may put any value in the input and the
|
|
preallocated urb->transfer_buffer may not be large enough to hold the data.
|
|
Thus, the malicious entity is able to write arbitrary data to kernel memory.
|
|
|
|
Signed-off-by: Ignat Korchagin <ignat.korchagin@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit b348d7dddb6c4fbfc810b7a0626e8ec9e29f7cbb)
|
|
|
|
Change-Id: I402ca8adef71745a85ba2c51945b99d46509c06e
|
|
Signed-off-by: Akshaya <akshayab@codeaurora.org>
|
|
---
|
|
drivers/usb/usbip/usbip_common.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
|
|
index facaaf0..e40da77 100644
|
|
--- a/drivers/usb/usbip/usbip_common.c
|
|
+++ b/drivers/usb/usbip/usbip_common.c
|
|
@@ -741,6 +741,17 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)
|
|
if (!(size > 0))
|
|
return 0;
|
|
|
|
+ if (size > urb->transfer_buffer_length) {
|
|
+ /* should not happen, probably malicious packet */
|
|
+ if (ud->side == USBIP_STUB) {
|
|
+ usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);
|
|
+ return 0;
|
|
+ } else {
|
|
+ usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
|
|
+ return -EPIPE;
|
|
+ }
|
|
+ }
|
|
+
|
|
ret = usbip_recv(ud->tcp_socket, urb->transfer_buffer, size);
|
|
if (ret != size) {
|
|
dev_err(&urb->dev->dev, "recv xbuf, %d\n", ret);
|
|
--
|
|
1.9.1
|
|
|