rpms/kernel/F-9 linux-2.6-usb-cdc-wdm-fix-oops.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.43, 1.891.2.44

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv928

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-usb-cdc-wdm-fix-oops.patch 
Log Message:
Fix oops in cdc-wdm modem driver. (#481741)

linux-2.6-usb-cdc-wdm-fix-oops.patch:

--- NEW FILE linux-2.6-usb-cdc-wdm-fix-oops.patch ---
>From oliver at neukum.org  Tue Apr  7 11:12:23 2009
From: Oliver Neukum <oliver at neukum.org>
Date: Sat, 4 Apr 2009 09:25:15 +0200
Subject: USB: fix oops in cdc-wdm in case of malformed descriptors
To: greg at kroah.com, Chuck Ebbert <cebbert at redhat.com>
Message-ID: <200904040925.23539.oliver at neukum.org>
Content-Disposition: inline


cdc-wdm needs to ignore extremely malformed descriptors.

Signed-off-by: Oliver Neukum <oliver at neukum.org>
Cc: stable <stable at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>


---
 drivers/usb/class/cdc-wdm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -652,7 +652,7 @@ next_desc:
 
 	iface = &intf->altsetting[0];
 	ep = &iface->endpoint[0].desc;
-	if (!usb_endpoint_is_int_in(ep)) {
+	if (!ep || !usb_endpoint_is_int_in(ep)) {
 		rv = -EINVAL;
 		goto err;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.43
retrieving revision 1.891.2.44
diff -u -r1.891.2.43 -r1.891.2.44
--- kernel.spec	7 Apr 2009 19:08:47 -0000	1.891.2.43
+++ kernel.spec	8 Apr 2009 19:50:22 -0000	1.891.2.44
@@ -733,6 +733,7 @@
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 Patch2301: linux-2.6-usb-option-increase-outgoing-buffers.patch
+Patch2302: linux-2.6-usb-cdc-wdm-fix-oops.patch
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
@@ -1167,6 +1168,8 @@
 # actually honor the nousb parameter
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-option-increase-outgoing-buffers.patch
+# bz 481741
+ApplyPatch linux-2.6-usb-cdc-wdm-fix-oops.patch
 
 # ACPI
 # fix cpu detection (f10#435653)
@@ -1950,6 +1953,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Apr 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.44
+- Fix oops in cdc-wdm modem driver. (#481741)
+
 * Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.43
 - iwlwifi: remove implicit direct scan