lkml.org 
[lkml]   [2020]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 4.19 079/191] orinoco: avoid assertion in case of NULL pointer
    Hi!

    > From: Aditya Pakki <pakki001@umn.edu>
    >
    > [ Upstream commit c705f9fc6a1736dcf6ec01f8206707c108dca824 ]
    >
    > In ezusb_init, if upriv is NULL, the code crashes. However, the caller
    > in ezusb_probe can handle the error and print the failure message.
    > The patch replaces the BUG_ON call to error return.

    The caller already checked that upriv is not NULL, AFAICT.

    priv = alloc_orinocodev(sizeof(*upriv), &udev->dev,
    ezusb_hard_reset, NULL);
    if (!priv) {
    err("Couldn't allocate orinocodev");
    retval = -ENOMEM;
    goto exit;
    }

    I don't see this as an improvement.

    Best regards,
    Pavel


    > +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
    > @@ -1364,7 +1364,8 @@ static int ezusb_init(struct hermes *hw)
    > int retval;
    >
    > BUG_ON(in_interrupt());
    > - BUG_ON(!upriv);
    > + if (!upriv)
    > + return -EINVAL;
    >
    > upriv->reply_count = 0;
    > /* Write the MAGIC number on the simulated registers to keep

    --
    (english) http://www.livejournal.com/~pavelmachek
    (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2020-02-25 11:28    [W:3.187 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site