queue-4.19/usb-sisusbvga-fix-oops-in-error-path-of-sisusb_probe.patch

   1 From 9a5729f68d3a82786aea110b1bfe610be318f80a Mon Sep 17 00:00:00 2001
   2 From: Oliver Neukum <oneukum@suse.com>
   3 Date: Thu, 9 May 2019 14:41:50 +0200
   4 Subject: USB: sisusbvga: fix oops in error path of sisusb_probe
   5
   6 From: Oliver Neukum <oneukum@suse.com>
   7
   8 commit 9a5729f68d3a82786aea110b1bfe610be318f80a upstream.
   9
  10 The pointer used to log a failure of usb_register_dev() must
  11 be set before the error is logged.
  12
  13 v2: fix that minor is not available before registration
  14
  15 Signed-off-by: oliver Neukum <oneukum@suse.com>
  16 Reported-by: syzbot+a0cbdbd6d169020c8959@syzkaller.appspotmail.com
  17 Fixes: 7b5cd5fefbe02 ("USB: SisUSB2VGA: Convert printk to dev_* macros")
  18 Cc: stable <stable@vger.kernel.org>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/usb/misc/sisusbvga/sisusb.c |   15 ++++++++-------
  23  1 file changed, 8 insertions(+), 7 deletions(-)
  24
  25 --- a/drivers/usb/misc/sisusbvga/sisusb.c
  26 +++ b/drivers/usb/misc/sisusbvga/sisusb.c
  27 @@ -3029,6 +3029,13 @@ static int sisusb_probe(struct usb_inter
  28
  29         mutex_init(&(sisusb->lock));
  30
  31 +       sisusb->sisusb_dev = dev;
  32 +       sisusb->vrambase   = SISUSB_PCI_MEMBASE;
  33 +       sisusb->mmiobase   = SISUSB_PCI_MMIOBASE;
  34 +       sisusb->mmiosize   = SISUSB_PCI_MMIOSIZE;
  35 +       sisusb->ioportbase = SISUSB_PCI_IOPORTBASE;
  36 +       /* Everything else is zero */
  37 +
  38         /* Register device */
  39         retval = usb_register_dev(intf, &usb_sisusb_class);
  40         if (retval) {
  41 @@ -3039,13 +3046,7 @@ static int sisusb_probe(struct usb_inter
  42                 goto error_1;
  43         }
  44
  45 -       sisusb->sisusb_dev = dev;
  46 -       sisusb->minor      = intf->minor;
  47 -       sisusb->vrambase   = SISUSB_PCI_MEMBASE;
  48 -       sisusb->mmiobase   = SISUSB_PCI_MMIOBASE;
  49 -       sisusb->mmiosize   = SISUSB_PCI_MMIOSIZE;
  50 -       sisusb->ioportbase = SISUSB_PCI_IOPORTBASE;
  51 -       /* Everything else is zero */
  52 +       sisusb->minor = intf->minor;
  53
  54         /* Allocate buffers */
  55         sisusb->ibufsize = SISUSB_IBUF_SIZE;