]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usbip: stub_rx: fix static checker warning on unnecessary checks
authorShuah Khan <shuahkh@osg.samsung.com>
Fri, 15 Dec 2017 17:05:15 +0000 (10:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Dec 2017 10:40:55 +0000 (11:40 +0100)
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>
drivers/usb/usbip/stub_rx.c

index 2f29be4740980fa37e1a49a047eebf129db1357f..6c5a593139996fe11be9c2bf86eb8cc19a390ef1 100644 (file)
@@ -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);