Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used
Date	Tue, 16 Feb 2016 04:10:01 +0100
Message-ID	<r2Ebv-1RL-9@gated-at.bofh.it> (permalink)
References	<r0ZWP-17m-23@gated-at.bofh.it> <r10pR-1zg-37@gated-at.bofh.it>
Content-Type	multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-gayCtP6D6hEfi9Dw0fR1"
X-Mailer	Evolution 3.18.3-1
MIME-Version	1.0
X-Sa-Exim-Connect-IP	2a02:8011:400e:2:b06c:6b7a:5449:a1ad
X-Sa-Exim-Mail-From	ben@decadent.org.uk
X-Sa-Exim-Scanned	No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	72
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Oliver Neukum <oneukum@suse.com>
X-Original-Date	Tue, 16 Feb 2016 03:06:17 +0000
X-Original-Message-ID	<1455591977.1143.9.camel@decadent.org.uk>
X-Original-References	<74c0820133f1dada0d70c74bc70a9530b2697f86.1455198893.git.jslaby@suse.cz> <769954681990aa9ff4c50fb4a3b953894bf03345.1455198893.git.jslaby@suse.cz>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1334976

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

On Thu, 2016-02-11 at 14:58 +0100, Jiri Slaby wrote:
> From: Oliver Neukum <oneukum@suse.com>
> 
> 3.12-stable review patch.  If anyone has any objections, please let me know.
> 
> ===============
> 
> commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream.
> 
> The module should fail to load.
> 
> Signed-off-by: Oliver Neukum <oneukum@suse.com>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
>  drivers/usb/host/xhci.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 47b25542a99c..6888e9a956d4 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -4891,6 +4891,10 @@ static int __init xhci_hcd_init(void)
>  	BUILD_BUG_ON(sizeof(struct xhci_intr_reg) != 8*32/8);
>  	/* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */
>  	BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8);
> +
> +	if (usb_disabled())
> +		return -ENODEV;
> +
>  	return 0;
>  unreg_pci:
>  	xhci_unregister_pci();

This check needs to go at the top of the function, before the call to
xhci_register_pci().

Ben.

-- 
Ben Hutchings
Life is what happens to you while you're busy making other plans.
                                                               - John Lennon

Thread

[PATCH 3.12 20/64] xhci: refuse loading if nousb is used Jiri Slaby <jslaby@suse.cz> - 2016-02-11 15:30 +0100
  Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used Ben Hutchings <ben@decadent.org.uk> - 2016-02-16 04:10 +0100
    Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used Jiri Slaby <jslaby@suse.cz> - 2016-02-16 09:50 +0100

csiph-web