diff options
author | Ignat Korchagin <ignat.korchagin@gmail.com> | 2016-03-17 14:00:29 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-31 00:55:36 -0400 |
commit | b348d7dddb6c4fbfc810b7a0626e8ec9e29f7cbb (patch) | |
tree | 1bdec0c54682109dbec9df99f5e104c2dd9ac9f2 | |
parent | 8ef34aa5a1b4fd940df6cba185fd28d3b750b727 (diff) |
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>
-rw-r--r-- | drivers/usb/usbip/usbip_common.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c index facaaf003f19..e40da7759a0e 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) | |||
741 | if (!(size > 0)) | 741 | if (!(size > 0)) |
742 | return 0; | 742 | return 0; |
743 | 743 | ||
744 | if (size > urb->transfer_buffer_length) { | ||
745 | /* should not happen, probably malicious packet */ | ||
746 | if (ud->side == USBIP_STUB) { | ||
747 | usbip_event_add(ud, SDEV_EVENT_ERROR_TCP); | ||
748 | return 0; | ||
749 | } else { | ||
750 | usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); | ||
751 | return -EPIPE; | ||
752 | } | ||
753 | } | ||
754 | |||
744 | ret = usbip_recv(ud->tcp_socket, urb->transfer_buffer, size); | 755 | ret = usbip_recv(ud->tcp_socket, urb->transfer_buffer, size); |
745 | if (ret != size) { | 756 | if (ret != size) { |
746 | dev_err(&urb->dev->dev, "recv xbuf, %d\n", ret); | 757 | dev_err(&urb->dev->dev, "recv xbuf, %d\n", ret); |