This is a note to let you know that I've just added the patch titled
USB: cdc-acm: check for valid interfaces
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-cdc-acm-check-for-valid-interfaces.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 403dff4e2c94f275e24fd85f40b2732ffec268a1 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 7 Nov 2014 08:48:15 -0800
Subject: USB: cdc-acm: check for valid interfaces
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
commit 403dff4e2c94f275e24fd85f40b2732ffec268a1 upstream.
We need to check that we have both a valid data and control inteface for both
types of headers (union and not union.)
References: https://bugzilla.kernel.org/show_bug.cgi?id=83551
Reported-by: Simon Schubert <2+kernel@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/class/cdc-acm.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1087,10 +1087,11 @@ next_desc:
} else {
control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));
- if (!control_interface || !data_interface) {
- dev_dbg(&intf->dev, "no interfaces\n");
- return -ENODEV;
- }
+ }
+
+ if (!control_interface || !data_interface) {
+ dev_dbg(&intf->dev, "no interfaces\n");
+ return -ENODEV;
}
if (data_interface_num != call_interface_num)
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-3.10/hid-add-battery-quirk-for-usb_device_id_apple_alu_wireless_2011_iso-keyboard.patch
queue-3.10/asoc-sigmadsp-refuse-to-load-firmware-files-with-a-non-supported-version.patch
queue-3.10/x86-vdso-use-asm-volatile-in-__getcpu.patch
queue-3.10/alsa-hda-using-uninitialized-data.patch
queue-3.10/asoc-dwc-ensure-fifos-are-flushed-to-prevent-channel-swap.patch
queue-3.10/hid-i2c-hid-prevent-buffer-overflow-in-early-irq.patch
queue-3.10/can-peak_usb-fix-memset-usage.patch
queue-3.10/pstore-ram-allow-optional-mapping-with-pgprot_noncached.patch
queue-3.10/alsa-usb-audio-extend-kef-x300a-fu-10-tweak-to-arcam-rpac.patch
queue-3.10/hid-roccat-potential-out-of-bounds-in-pyra_sysfs_write_settings.patch
queue-3.10/asoc-max98090-fix-ill-defined-sidetone-route.patch
queue-3.10/pci-restore-detection-of-read-only-bars.patch
queue-3.10/swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch
queue-3.10/hid-i2c-hid-fix-race-condition-reading-reports.patch
queue-3.10/ocfs2-fix-journal-commit-deadlock.patch
queue-3.10/pstore-ram-fix-hangs-by-using-write-combine-mappings.patch
queue-3.10/ath9k_hw-fix-hardware-queue-allocation.patch
queue-3.10/ath5k-fix-hardware-queue-index-assignment.patch
queue-3.10/ath9k-fix-be-bk-queue-order.patch
queue-3.10/iommu-vt-d-fix-an-off-by-one-bug-in-__domain_mapping.patch
queue-3.10/usb-cdc-acm-check-for-valid-interfaces.patch
queue-3.10/hid-add-a-new-id-0x501a-for-genius-mousepen-i608x.patch
queue-3.10/ubi-fix-invalid-vfree.patch
queue-3.10/driver-core-fix-unbalanced-device-reference-in-drivers_probe.patch
queue-3.10/x86_64-vdso-fix-the-vdso-address-randomization-algorithm.patch
queue-3.10/can-peak_usb-fix-cleanup-sequence-order-in-case-of-error-during-init.patch
queue-3.10/alsa-hda-fix-wrong-gpio_dir-gpio_mask-hint-setups-for-idt-stac-codecs.patch
queue-3.10/ubi-fix-double-free-after-do_sync_erase.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html