From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753375AbcBPDGd (ORCPT ); Mon, 15 Feb 2016 22:06:33 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:37776 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753203AbcBPDGb (ORCPT ); Mon, 15 Feb 2016 22:06:31 -0500 Message-ID: <1455591977.1143.9.camel@decadent.org.uk> Subject: Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used From: Ben Hutchings To: Jiri Slaby , stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Oliver Neukum Date: Tue, 16 Feb 2016 03:06:17 +0000 In-Reply-To: <769954681990aa9ff4c50fb4a3b953894bf03345.1455198893.git.jslaby@suse.cz> References: <74c0820133f1dada0d70c74bc70a9530b2697f86.1455198893.git.jslaby@suse.cz> <769954681990aa9ff4c50fb4a3b953894bf03345.1455198893.git.jslaby@suse.cz> 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-gayCtP6D6hEfi9Dw0fR1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2016-02-11 at 14:58 +0100, Jiri Slaby wrote: > From: Oliver Neukum >=20 > 3.12-stable review patch.=C2=A0=C2=A0If anyone has any objections, please= let me know. >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream. >=20 > The module should fail to load. >=20 > Signed-off-by: Oliver Neukum > Signed-off-by: Jiri Slaby > --- > =C2=A0drivers/usb/host/xhci.c | 4 ++++ > =C2=A01 file changed, 4 insertions(+) >=20 > 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) > =C2=A0 BUILD_BUG_ON(sizeof(struct xhci_intr_reg) !=3D 8*32/8); > =C2=A0 /* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */ > =C2=A0 BUILD_BUG_ON(sizeof(struct xhci_run_regs) !=3D (8+8*128)*32/8); > + > + if (usb_disabled()) > + return -ENODEV; > + > =C2=A0 return 0; > =C2=A0unreg_pci: > =C2=A0 xhci_unregister_pci(); This check needs to go at the top of the function, before the call to xhci_register_pci(). Ben. --=20 Ben Hutchings Life is what happens to you while you're busy making other plans. - John Lenno= n --=-gayCtP6D6hEfi9Dw0fR1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAVsKSKee/yOyVhhEJAQodgg//ZLhCtYAkJnBnxR5FLxwni5ke2FVAQnbt OzLNz13WjgUp+Trg2qBqUdeNpotvHtFgjfw1cMb4twlFdpvWs8ihwj38hCfVBtdV 51JQaYAFvS10q3tMfKE272pnQJSZ3WFFSTlBVyYo/M+6eEL07+05nwaoYmH9+AC/ gl2iBytpedjHyH/8wamTG7zr4xqJONTveLQ0aKu6a3qrnmUJs80JNlj2iMKVVoIV s9bjxhP8ZOwSgG6wV/Iak48TDIV/CVG7yAdoyv7lywbMJRdHDfBbVNbH0aU/sRBz 6tmrBRAM+Qe3z0TeIiYRzpW7OgNOc8U435ZGMLVtHn+yU6wcV0X0lcTKkd6mPeip SR60MFerk7r1boDXRLZ/aVd5rDV6R56cKEHztmvObUOibk9gQhPIVbwM0J1OzAqt ncfbU2cyMmZFF0DrSrXGu2dYMtpx5EZtm99+pmZFQqrWcOGA428aJQg1Uk4HR1VV ksxM1ri3AxE8eI5SL/S6RecYEEt0NeNt6pdVshb9qTd+YQcku6Eg2JIJsssSiuFd oQD+12J67mjO6JdxynfAEFmX9yQOf2iHdSy45aKvFgHJYrtXJYK5Ffh6s0LAUYuD AvAcip3pgwaEZIEFGN8E3WEhsvcgwf8ow9XgJO4JVOYOIzsiQZREoVIn8bI272lE pyjIaXNnxh8= =lpbo -----END PGP SIGNATURE----- --=-gayCtP6D6hEfi9Dw0fR1--