Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp419682ybi; Fri, 7 Jun 2019 10:11:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqx6vjSfzdhYdYb1/DTeWABbbaCdD353LC9KBh1qVFQm4uf6MS9rCpp8lCU4LRa/US5zWV+c X-Received: by 2002:a17:902:581:: with SMTP id f1mr57098596plf.343.1559927467638; Fri, 07 Jun 2019 10:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559927467; cv=none; d=google.com; s=arc-20160816; b=zfCIsoqt3dv8mswNyiC14bV4W29YnIVJgDLaFI9O/AgPVOvvt89wS/oU4MQhJtEphp WSmkBgeVKn5oNkGk4VgZ1BLW/3N1c6m55Q3K/9Y7cyRnA29BZ6h++NAv85sWoOC1tvXh O+rjSDG7v35P5++4JhFSZgS7SF7v+iDK2IYhzbPmke6o6jwWwqrOG9tdJvIJO8+//vD3 BWGwvFhnF69d9OPE/BlYCebXlUo/d4YVIHMTvetWVE60ko9/YWY2tKH5jUWm1HowXv1a D/sYIMVu4F/qgDAbnjr137PhHDJqNujFhHI6oMQS4w6OlWCa7QoveyMS4OO0tzRZGEDB 0bcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RnlI7Bp4jJ2THxaXSURj5PTPHbITa+jMPYO5DjBQYy0=; b=Mrm9LaPRF7JlA2mVPWYezkNTS+U218TKKLqbcJxsas0G8FI7GedHZAGFpHQ141wz5L c7zCZPH8c80HIymp8iCwPgo6l5BmSv+VDNTGTVvAtrOUHejhCE/qucK9HDEh/Z0ZDefj pwVR4TFiW2yx0UfN24kk/CfkgTculwnGun0Au/hEXNPhp8EIKGsPH6fLz9qGHr1iucUD ZAJ1PIAW5vsgMGyvWTRxu+7t/33d4O3bv5mcDF2dm3R+eWInDWe2M90H2W+fkSbPrZdY 8o3zPZKQB9yW5d/qIvXcdIaBH8s61HSOQbMKSNMqI+HjFRUF31ZpdMpd8V8jwabmiH/B sUjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ro55zj5w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w4si2472404plp.223.2019.06.07.10.10.50; Fri, 07 Jun 2019 10:11:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ro55zj5w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730306AbfFGPlY (ORCPT + 99 others); Fri, 7 Jun 2019 11:41:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:51220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729325AbfFGPlX (ORCPT ); Fri, 7 Jun 2019 11:41:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 77A23212F5; Fri, 7 Jun 2019 15:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922082; bh=bfZWmySO61ibUp60ui+SXJiThcWG0S7HkCoOlmzHoyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ro55zj5wRke47k5GajAdr4qT+5ZSjLblYq25SXoxcljo/0je1uAPDcfxutVgUkj/a dQjPz9f76xIKepeL9+UwM2ki+fRiE3STfv8MmaYauZa4zEQsFCcu22Gt+cVlgi1o0T K4w3MqFiX5A1pYpIjauio+cZRnmoymXTJV98jQZ4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, oliver Neukum , syzbot+a0cbdbd6d169020c8959@syzkaller.appspotmail.com Subject: [PATCH 4.14 30/69] USB: sisusbvga: fix oops in error path of sisusb_probe Date: Fri, 7 Jun 2019 17:39:11 +0200 Message-Id: <20190607153852.103448909@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oliver Neukum commit 9a5729f68d3a82786aea110b1bfe610be318f80a upstream. The pointer used to log a failure of usb_register_dev() must be set before the error is logged. v2: fix that minor is not available before registration Signed-off-by: oliver Neukum Reported-by: syzbot+a0cbdbd6d169020c8959@syzkaller.appspotmail.com Fixes: 7b5cd5fefbe02 ("USB: SisUSB2VGA: Convert printk to dev_* macros") Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/sisusbvga/sisusb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c @@ -3028,6 +3028,13 @@ static int sisusb_probe(struct usb_inter mutex_init(&(sisusb->lock)); + sisusb->sisusb_dev = dev; + sisusb->vrambase = SISUSB_PCI_MEMBASE; + sisusb->mmiobase = SISUSB_PCI_MMIOBASE; + sisusb->mmiosize = SISUSB_PCI_MMIOSIZE; + sisusb->ioportbase = SISUSB_PCI_IOPORTBASE; + /* Everything else is zero */ + /* Register device */ retval = usb_register_dev(intf, &usb_sisusb_class); if (retval) { @@ -3038,13 +3045,7 @@ static int sisusb_probe(struct usb_inter goto error_1; } - sisusb->sisusb_dev = dev; - sisusb->minor = intf->minor; - sisusb->vrambase = SISUSB_PCI_MEMBASE; - sisusb->mmiobase = SISUSB_PCI_MMIOBASE; - sisusb->mmiosize = SISUSB_PCI_MMIOSIZE; - sisusb->ioportbase = SISUSB_PCI_IOPORTBASE; - /* Everything else is zero */ + sisusb->minor = intf->minor; /* Allocate buffers */ sisusb->ibufsize = SISUSB_IBUF_SIZE;