drop usbip patch from 4.4, it shouldn't have gone there

diff --git a/queue-4.4/series b/queue-4.4/series
index 53649388da657aa395a3f060ab752093d48b06b6..f1f99dfe10abdb2c1869dec20e0448e3cac69b5f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -21,5 +21,4 @@ can-peak_usb-fix-a-potential-out-of-sync-while-decoding-packets.patch
 can-gs_usb-gs_can_open-prevent-memory-leak.patch
 can-peak_usb-fix-slab-info-leak.patch
 drivers-usb-usbip-add-missing-break-statement-to-switch.patch
-usbip-stub_rx-fix-static-checker-warning-on-unnecessary-checks.patch
 configfs-fix-a-deadlock-in-configfs_symlink.patch

diff --git a/queue-4.4/usbip-stub_rx-fix-static-checker-warning-on-unnecessary-checks.patch b/queue-4.4/usbip-stub_rx-fix-static-checker-warning-on-unnecessary-checks.patch
deleted file mode 100644 (file)
index f580f1d..0000000
--- a/queue-4.4/usbip-stub_rx-fix-static-checker-warning-on-unnecessary-checks.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 10c90120930628e8b959bf58d4a0aaef3ae5d945 Mon Sep 17 00:00:00 2001
-From: Shuah Khan <shuah@kernel.org>
-Date: Fri, 15 Dec 2017 10:05:15 -0700
-Subject: usbip: stub_rx: fix static checker warning on unnecessary checks
-
-From: Shuah Khan <shuahkh@osg.samsung.com>
-
-commit 10c90120930628e8b959bf58d4a0aaef3ae5d945 upstream.
-
-Fix the following static checker warnings:
-
-The patch c6688ef9f297: "usbip: fix stub_rx: harden CMD_SUBMIT path
-to handle malicious input" from Dec 7, 2017, leads to the following
-static checker warning:
-
-    drivers/usb/usbip/stub_rx.c:346 get_pipe()
-    warn: impossible condition
-'(pdu->u.cmd_submit.transfer_buffer_length > ((~0 >> 1))) =>
-(s32min-s32max > s32max)'
-    drivers/usb/usbip/stub_rx.c:486 stub_recv_cmd_submit()
-    warn: always true condition
-'(pdu->u.cmd_submit.transfer_buffer_length <= ((~0 >> 1))) =>
-(s32min-s32max <= s32max)'
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
-index 2f29be474098..6c5a59313999 100644
---- a/drivers/usb/usbip/stub_rx.c
-+++ b/drivers/usb/usbip/stub_rx.c
-@@ -339,14 +339,6 @@ static int get_pipe(struct stub_device *sdev, struct usbip_header *pdu)
- 
-       epd = &ep->desc;
- 
--      /* validate transfer_buffer_length */
--      if (pdu->u.cmd_submit.transfer_buffer_length > INT_MAX) {
--              dev_err(&sdev->udev->dev,
--                      "CMD_SUBMIT: -EMSGSIZE transfer_buffer_length %d\n",
--                      pdu->u.cmd_submit.transfer_buffer_length);
--              return -1;
--      }
--
-       if (usb_endpoint_xfer_control(epd)) {
-               if (dir == USBIP_DIR_OUT)
-                       return usb_sndctrlpipe(udev, epnum);
-@@ -479,8 +471,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
-       }
- 
-       /* allocate urb transfer buffer, if needed */
--      if (pdu->u.cmd_submit.transfer_buffer_length > 0 &&
--          pdu->u.cmd_submit.transfer_buffer_length <= INT_MAX) {
-+      if (pdu->u.cmd_submit.transfer_buffer_length > 0) {
-               priv->urb->transfer_buffer =
-                       kzalloc(pdu->u.cmd_submit.transfer_buffer_length,
-                               GFP_KERNEL);