lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 052/136] usb: wusbcore: security: cast sizeof to int for comparison
    Date
    From: Julia Lawall <Julia.Lawall@lip6.fr>

    [ Upstream commit d3ac5598c5010a8999978ebbcca3b1c6188ca36b ]

    Comparing an int to a size, which is unsigned, causes the int to become
    unsigned, giving the wrong result. usb_get_descriptor can return a
    negative error code.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    // <smpl>
    @@
    int x;
    expression e,e1;
    identifier f;
    @@

    *x = f(...);
    ... when != x = e1
    when != if (x < 0 || ...) { ... return ...; }
    *x < sizeof(e)
    // </smpl>

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/usb/wusbcore/security.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
    index 33d2f5d7f33b..14ac8c98ac9e 100644
    --- a/drivers/usb/wusbcore/security.c
    +++ b/drivers/usb/wusbcore/security.c
    @@ -217,7 +217,7 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc,

    result = usb_get_descriptor(usb_dev, USB_DT_SECURITY,
    0, secd, sizeof(*secd));
    - if (result < sizeof(*secd)) {
    + if (result < (int)sizeof(*secd)) {
    dev_err(dev, "Can't read security descriptor or "
    "not enough data: %d\n", result);
    goto out;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:34    [W:3.374 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site