From: Greg Kroah-Hartman Date: Thu, 7 Sep 2017 14:47:23 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v4.13.1~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08031c4337190f0b9896eb361a8b2f0c5564fd45;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: cma-fix-calculation-of-aligned-offset.patch dlm-avoid-double-free-on-error-path-in-dlm_device_-register-unregister.patch driver-core-bus-fix-a-potential-double-free.patch input-trackpoint-assume-3-buttons-when-buttons-detection-fails.patch staging-rts5208-fix-incorrect-shift-to-extract-upper-nybble.patch usb-core-avoid-race-of-async_completed-w-usbdev_release.patch --- diff --git a/queue-3.18/cma-fix-calculation-of-aligned-offset.patch b/queue-3.18/cma-fix-calculation-of-aligned-offset.patch new file mode 100644 index 00000000000..88e6db00750 --- /dev/null +++ b/queue-3.18/cma-fix-calculation-of-aligned-offset.patch @@ -0,0 +1,85 @@ +From e048cb32f69038aa1c8f11e5c1b331be4181659d Mon Sep 17 00:00:00 2001 +From: Doug Berger +Date: Mon, 10 Jul 2017 15:49:44 -0700 +Subject: cma: fix calculation of aligned offset + +From: Doug Berger + +commit e048cb32f69038aa1c8f11e5c1b331be4181659d upstream. + +The align_offset parameter is used by bitmap_find_next_zero_area_off() +to represent the offset of map's base from the previous alignment +boundary; the function ensures that the returned index, plus the +align_offset, honors the specified align_mask. + +The logic introduced by commit b5be83e308f7 ("mm: cma: align to physical +address, not CMA region position") has the cma driver calculate the +offset to the *next* alignment boundary. In most cases, the base +alignment is greater than that specified when making allocations, +resulting in a zero offset whether we align up or down. In the example +given with the commit, the base alignment (8MB) was half the requested +alignment (16MB) so the math also happened to work since the offset is +8MB in both directions. However, when requesting allocations with an +alignment greater than twice that of the base, the returned index would +not be correctly aligned. + +Also, the align_order arguments of cma_bitmap_aligned_mask() and +cma_bitmap_aligned_offset() should not be negative so the argument type +was made unsigned. + +Fixes: b5be83e308f7 ("mm: cma: align to physical address, not CMA region position") +Link: http://lkml.kernel.org/r/20170628170742.2895-1-opendmb@gmail.com +Signed-off-by: Angus Clark +Signed-off-by: Doug Berger +Acked-by: Gregory Fong +Cc: Doug Berger +Cc: Angus Clark +Cc: Laura Abbott +Cc: Vlastimil Babka +Cc: Greg Kroah-Hartman +Cc: Lucas Stach +Cc: Catalin Marinas +Cc: Shiraz Hashim +Cc: Jaewon Kim +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/cma.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +--- a/mm/cma.c ++++ b/mm/cma.c +@@ -58,7 +58,7 @@ unsigned long cma_get_size(const struct + } + + static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, +- int align_order) ++ unsigned int align_order) + { + if (align_order <= cma->order_per_bit) + return 0; +@@ -66,17 +66,14 @@ static unsigned long cma_bitmap_aligned_ + } + + /* +- * Find a PFN aligned to the specified order and return an offset represented in +- * order_per_bits. ++ * Find the offset of the base PFN from the specified align_order. ++ * The value returned is represented in order_per_bits. + */ + static unsigned long cma_bitmap_aligned_offset(const struct cma *cma, +- int align_order) ++ unsigned int align_order) + { +- if (align_order <= cma->order_per_bit) +- return 0; +- +- return (ALIGN(cma->base_pfn, (1UL << align_order)) +- - cma->base_pfn) >> cma->order_per_bit; ++ return (cma->base_pfn & ((1UL << align_order) - 1)) ++ >> cma->order_per_bit; + } + + static unsigned long cma_bitmap_maxno(struct cma *cma) diff --git a/queue-3.18/dlm-avoid-double-free-on-error-path-in-dlm_device_-register-unregister.patch b/queue-3.18/dlm-avoid-double-free-on-error-path-in-dlm_device_-register-unregister.patch new file mode 100644 index 00000000000..7f83e91c1d1 --- /dev/null +++ b/queue-3.18/dlm-avoid-double-free-on-error-path-in-dlm_device_-register-unregister.patch @@ -0,0 +1,151 @@ +From 55acdd926f6b21a5cdba23da98a48aedf19ac9c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= +Date: Thu, 3 Aug 2017 10:30:06 +0100 +Subject: dlm: avoid double-free on error path in dlm_device_{register,unregister} +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Edwin Török + +commit 55acdd926f6b21a5cdba23da98a48aedf19ac9c3 upstream. + +Can be reproduced when running dlm_controld (tested on 4.4.x, 4.12.4): + # seq 1 100 | xargs -P0 -n1 dlm_tool join + # seq 1 100 | xargs -P0 -n1 dlm_tool leave + +misc_register fails due to duplicate sysfs entry, which causes +dlm_device_register to free ls->ls_device.name. +In dlm_device_deregister the name was freed again, causing memory +corruption. + +According to the comment in dlm_device_deregister the name should've been +set to NULL when registration fails, +so this patch does that. + +sysfs: cannot create duplicate filename '/dev/char/10:1' +------------[ cut here ]------------ +warning: cpu: 1 pid: 4450 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x56/0x70 +modules linked in: msr rfcomm dlm ccm bnep dm_crypt uvcvideo +videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_core videodev +btusb media btrtl btbcm btintel bluetooth ecdh_generic intel_rapl +x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm +snd_hda_codec_hdmi irqbypass crct10dif_pclmul crc32_pclmul +ghash_clmulni_intel thinkpad_acpi pcbc nvram snd_seq_midi +snd_seq_midi_event aesni_intel snd_hda_codec_realtek snd_hda_codec_generic +snd_rawmidi aes_x86_64 crypto_simd glue_helper snd_hda_intel snd_hda_codec +cryptd intel_cstate arc4 snd_hda_core snd_seq snd_seq_device snd_hwdep +iwldvm intel_rapl_perf mac80211 joydev input_leds iwlwifi serio_raw +cfg80211 snd_pcm shpchp snd_timer snd mac_hid mei_me lpc_ich mei soundcore +sunrpc parport_pc ppdev lp parport autofs4 i915 psmouse + e1000e ahci libahci i2c_algo_bit sdhci_pci ptp drm_kms_helper sdhci +pps_core syscopyarea sysfillrect sysimgblt fb_sys_fops drm wmi video +cpu: 1 pid: 4450 comm: dlm_test.exe not tainted 4.12.4-041204-generic +hardware name: lenovo 232425u/232425u, bios g2et82ww (2.02 ) 09/11/2012 +task: ffff96b0cbabe140 task.stack: ffffb199027d0000 +rip: 0010:sysfs_warn_dup+0x56/0x70 +rsp: 0018:ffffb199027d3c58 eflags: 00010282 +rax: 0000000000000038 rbx: ffff96b0e2c49158 rcx: 0000000000000006 +rdx: 0000000000000000 rsi: 0000000000000086 rdi: ffff96b15e24dcc0 +rbp: ffffb199027d3c70 r08: 0000000000000001 r09: 0000000000000721 +r10: ffffb199027d3c00 r11: 0000000000000721 r12: ffffb199027d3cd1 +r13: ffff96b1592088f0 r14: 0000000000000001 r15: ffffffffffffffef +fs: 00007f78069c0700(0000) gs:ffff96b15e240000(0000) +knlgs:0000000000000000 +cs: 0010 ds: 0000 es: 0000 cr0: 0000000080050033 +cr2: 000000178625ed28 cr3: 0000000091d3e000 cr4: 00000000001406e0 +call trace: + sysfs_do_create_link_sd.isra.2+0x9e/0xb0 + sysfs_create_link+0x25/0x40 + device_add+0x5a9/0x640 + device_create_groups_vargs+0xe0/0xf0 + device_create_with_groups+0x3f/0x60 + ? snprintf+0x45/0x70 + misc_register+0x140/0x180 + device_write+0x6a8/0x790 [dlm] + __vfs_write+0x37/0x160 + ? apparmor_file_permission+0x1a/0x20 + ? security_file_permission+0x3b/0xc0 + vfs_write+0xb5/0x1a0 + sys_write+0x55/0xc0 + ? sys_fcntl+0x5d/0xb0 + entry_syscall_64_fastpath+0x1e/0xa9 +rip: 0033:0x7f78083454bd +rsp: 002b:00007f78069bbd30 eflags: 00000293 orig_rax: 0000000000000001 +rax: ffffffffffffffda rbx: 0000000000000006 rcx: 00007f78083454bd +rdx: 000000000000009c rsi: 00007f78069bee00 rdi: 0000000000000005 +rbp: 00007f77f8000a20 r08: 000000000000fcf0 r09: 0000000000000032 +r10: 0000000000000024 r11: 0000000000000293 r12: 00007f78069bde00 +r13: 00007f78069bee00 r14: 000000000000000a r15: 00007f78069bbd70 +code: 85 c0 48 89 c3 74 12 b9 00 10 00 00 48 89 c2 31 f6 4c 89 ef e8 2c c8 +ff ff 4c 89 e2 48 89 de 48 c7 c7 b0 8e 0c a8 e8 41 e8 ed ff <0f> ff 48 89 +df e8 00 d5 f4 ff 5b 41 5c 41 5d 5d c3 66 0f 1f 84 +---[ end trace 40412246357cc9e0 ]--- + +dlm: 59f24629-ae39-44e2-9030-397ebc2eda26: leaving the lockspace group... +bug: unable to handle kernel null pointer dereference at 0000000000000001 +ip: [] kmem_cache_alloc+0x7a/0x140 +pgd 0 +oops: 0000 [#1] smp +modules linked in: dlm 8021q garp mrp stp llc openvswitch nf_defrag_ipv6 +nf_conntrack libcrc32c iptable_filter dm_multipath crc32_pclmul dm_mod +aesni_intel psmouse aes_x86_64 sg ablk_helper cryptd lrw gf128mul +glue_helper i2c_piix4 nls_utf8 tpm_tis tpm isofs nfsd auth_rpcgss +oid_registry nfs_acl lockd grace sunrpc xen_wdt ip_tables x_tables autofs4 +hid_generic usbhid hid sr_mod cdrom sd_mod ata_generic pata_acpi 8139too +serio_raw ata_piix 8139cp mii uhci_hcd ehci_pci ehci_hcd libata +scsi_dh_rdac scsi_dh_hp_sw scsi_dh_emc scsi_dh_alua scsi_mod ipv6 +cpu: 0 pid: 394 comm: systemd-udevd tainted: g w 4.4.0+0 #1 +hardware name: xen hvm domu, bios 4.7.2-2.2 05/11/2017 +task: ffff880002410000 ti: ffff88000243c000 task.ti: ffff88000243c000 +rip: e030:[] [] +kmem_cache_alloc+0x7a/0x140 +rsp: e02b:ffff88000243fd90 eflags: 00010202 +rax: 0000000000000000 rbx: ffff8800029864d0 rcx: 000000000007b36c +rdx: 000000000007b36b rsi: 00000000024000c0 rdi: ffff880036801c00 +rbp: ffff88000243fdc0 r08: 0000000000018880 r09: 0000000000000054 +r10: 000000000000004a r11: ffff880034ace6c0 r12: 00000000024000c0 +r13: ffff880036801c00 r14: 0000000000000001 r15: ffffffff8118dcc2 +fs: 00007f0ab77548c0(0000) gs:ffff880036e00000(0000) knlgs:0000000000000000 +cs: e033 ds: 0000 es: 0000 cr0: 0000000080050033 +cr2: 0000000000000001 cr3: 000000000332d000 cr4: 0000000000040660 +stack: +ffffffff8118dc90 ffff8800029864d0 0000000000000000 ffff88003430b0b0 +ffff880034b78320 ffff88003430b0b0 ffff88000243fdf8 ffffffff8118dcc2 +ffff8800349c6700 ffff8800029864d0 000000000000000b 00007f0ab7754b90 +call trace: +[] ? anon_vma_fork+0x60/0x140 +[] anon_vma_fork+0x92/0x140 +[] copy_process+0xcae/0x1a80 +[] _do_fork+0x8b/0x2d0 +[] sys_clone+0x19/0x20 +[] entry_syscall_64_fastpath+0x12/0x71 +] code: f6 75 1c 4c 89 fa 44 89 e6 4c 89 ef e8 a7 e4 00 00 41 f7 c4 00 80 +00 00 49 89 c6 74 47 eb 32 49 63 45 20 48 8d 4a 01 4d 8b 45 00 <49> 8b 1c +06 4c 89 f0 65 49 0f c7 08 0f 94 c0 84 c0 74 ac 49 63 +rip [] kmem_cache_alloc+0x7a/0x140 +rsp +cr2: 0000000000000001 +--[ end trace 70cb9fd1b164a0e8 ]-- + +Signed-off-by: Edwin Török +Signed-off-by: David Teigland +Signed-off-by: Greg Kroah-Hartman + +--- + fs/dlm/user.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/fs/dlm/user.c ++++ b/fs/dlm/user.c +@@ -346,6 +346,10 @@ static int dlm_device_register(struct dl + error = misc_register(&ls->ls_device); + if (error) { + kfree(ls->ls_device.name); ++ /* this has to be set to NULL ++ * to avoid a double-free in dlm_device_deregister ++ */ ++ ls->ls_device.name = NULL; + } + fail: + return error; diff --git a/queue-3.18/driver-core-bus-fix-a-potential-double-free.patch b/queue-3.18/driver-core-bus-fix-a-potential-double-free.patch new file mode 100644 index 00000000000..2d7895c0716 --- /dev/null +++ b/queue-3.18/driver-core-bus-fix-a-potential-double-free.patch @@ -0,0 +1,33 @@ +From 0f9b011d3321ca1079c7a46c18cb1956fbdb7bcb Mon Sep 17 00:00:00 2001 +From: Christophe JAILLET +Date: Tue, 29 Aug 2017 21:23:49 +0200 +Subject: driver core: bus: Fix a potential double free + +From: Christophe JAILLET + +commit 0f9b011d3321ca1079c7a46c18cb1956fbdb7bcb upstream. + +The .release function of driver_ktype is 'driver_release()'. +This function frees the container_of this kobject. + +So, this memory must not be freed explicitly in the error handling path of +'bus_add_driver()'. Otherwise a double free will occur. + +Signed-off-by: Christophe JAILLET +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/base/bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/base/bus.c ++++ b/drivers/base/bus.c +@@ -722,7 +722,7 @@ int bus_add_driver(struct device_driver + + out_unregister: + kobject_put(&priv->kobj); +- kfree(drv->p); ++ /* drv->p is freed in driver_release() */ + drv->p = NULL; + out_put_bus: + bus_put(bus); diff --git a/queue-3.18/input-trackpoint-assume-3-buttons-when-buttons-detection-fails.patch b/queue-3.18/input-trackpoint-assume-3-buttons-when-buttons-detection-fails.patch new file mode 100644 index 00000000000..8fdbd8b3609 --- /dev/null +++ b/queue-3.18/input-trackpoint-assume-3-buttons-when-buttons-detection-fails.patch @@ -0,0 +1,37 @@ +From 293b915fd9bebf33cdc906516fb28d54649a25ac Mon Sep 17 00:00:00 2001 +From: Oscar Campos +Date: Tue, 18 Jul 2017 17:20:36 -0700 +Subject: Input: trackpoint - assume 3 buttons when buttons detection fails + +From: Oscar Campos + +commit 293b915fd9bebf33cdc906516fb28d54649a25ac upstream. + +Trackpoint buttons detection fails on ThinkPad 570 and 470 series, +this makes the middle button of the trackpoint to not being recogized. +As I don't believe there is any trackpoint with less than 3 buttons this +patch just assumes three buttons when the extended button information +read fails. + +Signed-off-by: Oscar Campos +Acked-by: Peter Hutterer +Signed-off-by: Dmitry Torokhov +Signed-off-by: Aaron Ma +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/mouse/trackpoint.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/input/mouse/trackpoint.c ++++ b/drivers/input/mouse/trackpoint.c +@@ -377,8 +377,8 @@ int trackpoint_detect(struct psmouse *ps + return 0; + + if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { +- psmouse_warn(psmouse, "failed to get extended button data\n"); +- button_info = 0; ++ psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n"); ++ button_info = 0x33; + } + + psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL); diff --git a/queue-3.18/series b/queue-3.18/series index fc7d85d5de7..b992afce24f 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -2,3 +2,9 @@ usb-quirks-add-delay-init-quirk-for-corsair-strafe-rgb-keyboard.patch usb-serial-option-add-support-for-d-link-dwm-157-c1.patch usb-add-device-quirk-for-logitech-hd-pro-webcam-c920-c.patch usb-xhci-fix-regression-when-ati-chipsets-detected.patch +usb-core-avoid-race-of-async_completed-w-usbdev_release.patch +staging-rts5208-fix-incorrect-shift-to-extract-upper-nybble.patch +driver-core-bus-fix-a-potential-double-free.patch +input-trackpoint-assume-3-buttons-when-buttons-detection-fails.patch +dlm-avoid-double-free-on-error-path-in-dlm_device_-register-unregister.patch +cma-fix-calculation-of-aligned-offset.patch diff --git a/queue-3.18/staging-rts5208-fix-incorrect-shift-to-extract-upper-nybble.patch b/queue-3.18/staging-rts5208-fix-incorrect-shift-to-extract-upper-nybble.patch new file mode 100644 index 00000000000..5f13c834e66 --- /dev/null +++ b/queue-3.18/staging-rts5208-fix-incorrect-shift-to-extract-upper-nybble.patch @@ -0,0 +1,34 @@ +From 34ff1bf4920471cff66775dc39537b15c5f0feff Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Fri, 18 Aug 2017 14:34:16 +0100 +Subject: staging/rts5208: fix incorrect shift to extract upper nybble + +From: Colin Ian King + +commit 34ff1bf4920471cff66775dc39537b15c5f0feff upstream. + +The mask of sns_key_info1 suggests the upper nybble is being extracted +however the following shift of 8 bits is too large and always results in +0. Fix this by shifting only by 4 bits to correctly get the upper nybble. + +Detected by CoverityScan, CID#142891 ("Operands don't affect result") + +Fixes: fa590c222fba ("staging: rts5208: add support for rts5208 and rts5288") +Signed-off-by: Colin Ian King +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/rts5208/rtsx_scsi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/rts5208/rtsx_scsi.c ++++ b/drivers/staging/rts5208/rtsx_scsi.c +@@ -417,7 +417,7 @@ void set_sense_data(struct rtsx_chip *ch + sense->ascq = ascq; + if (sns_key_info0 != 0) { + sense->sns_key_info[0] = SKSV | sns_key_info0; +- sense->sns_key_info[1] = (sns_key_info1 & 0xf0) >> 8; ++ sense->sns_key_info[1] = (sns_key_info1 & 0xf0) >> 4; + sense->sns_key_info[2] = sns_key_info1 & 0x0f; + } + } diff --git a/queue-3.18/usb-core-avoid-race-of-async_completed-w-usbdev_release.patch b/queue-3.18/usb-core-avoid-race-of-async_completed-w-usbdev_release.patch new file mode 100644 index 00000000000..5bbf9938b51 --- /dev/null +++ b/queue-3.18/usb-core-avoid-race-of-async_completed-w-usbdev_release.patch @@ -0,0 +1,105 @@ +From ed62ca2f4f51c17841ea39d98c0c409cb53a3e10 Mon Sep 17 00:00:00 2001 +From: Douglas Anderson +Date: Thu, 10 Aug 2017 15:42:22 -0700 +Subject: USB: core: Avoid race of async_completed() w/ usbdev_release() + +From: Douglas Anderson + +commit ed62ca2f4f51c17841ea39d98c0c409cb53a3e10 upstream. + +While running reboot tests w/ a specific set of USB devices (and +slub_debug enabled), I found that once every few hours my device would +be crashed with a stack that looked like this: + +[ 14.012445] BUG: spinlock bad magic on CPU#0, modprobe/2091 +[ 14.012460] lock: 0xffffffc0cb055978, .magic: ffffffc0, .owner: cryption contexts: %lu/%lu +[ 14.012460] /1025536097, .owner_cpu: 0 +[ 14.012466] CPU: 0 PID: 2091 Comm: modprobe Not tainted 4.4.79 #352 +[ 14.012468] Hardware name: Google Kevin (DT) +[ 14.012471] Call trace: +[ 14.012483] [<....>] dump_backtrace+0x0/0x160 +[ 14.012487] [<....>] show_stack+0x20/0x28 +[ 14.012494] [<....>] dump_stack+0xb4/0xf0 +[ 14.012500] [<....>] spin_dump+0x8c/0x98 +[ 14.012504] [<....>] spin_bug+0x30/0x3c +[ 14.012508] [<....>] do_raw_spin_lock+0x40/0x164 +[ 14.012515] [<....>] _raw_spin_lock_irqsave+0x64/0x74 +[ 14.012521] [<....>] __wake_up+0x2c/0x60 +[ 14.012528] [<....>] async_completed+0x2d0/0x300 +[ 14.012534] [<....>] __usb_hcd_giveback_urb+0xc4/0x138 +[ 14.012538] [<....>] usb_hcd_giveback_urb+0x54/0xf0 +[ 14.012544] [<....>] xhci_irq+0x1314/0x1348 +[ 14.012548] [<....>] usb_hcd_irq+0x40/0x50 +[ 14.012553] [<....>] handle_irq_event_percpu+0x1b4/0x3f0 +[ 14.012556] [<....>] handle_irq_event+0x4c/0x7c +[ 14.012561] [<....>] handle_fasteoi_irq+0x158/0x1c8 +[ 14.012564] [<....>] generic_handle_irq+0x30/0x44 +[ 14.012568] [<....>] __handle_domain_irq+0x90/0xbc +[ 14.012572] [<....>] gic_handle_irq+0xcc/0x18c + +Investigation using kgdb() found that the wait queue that was passed +into wake_up() had been freed (it was filled with slub_debug poison). + +I analyzed and instrumented the code and reproduced. My current +belief is that this is happening: + +1. async_completed() is called (from IRQ). Moves "as" onto the + completed list. +2. On another CPU, proc_reapurbnonblock_compat() calls + async_getcompleted(). Blocks on spinlock. +3. async_completed() releases the lock; keeps running; gets blocked + midway through wake_up(). +4. proc_reapurbnonblock_compat() => async_getcompleted() gets the + lock; removes "as" from completed list and frees it. +5. usbdev_release() is called. Frees "ps". +6. async_completed() finally continues running wake_up(). ...but + wake_up() has a pointer to the freed "ps". + +The instrumentation that led me to believe this was based on adding +some trace_printk() calls in a select few functions and then using +kdb's "ftdump" at crash time. The trace follows (NOTE: in the trace +below I cheated a little bit and added a udelay(1000) in +async_completed() after releasing the spinlock because I wanted it to +trigger quicker): + +<...>-2104 0d.h2 13759034us!: async_completed at start: as=ffffffc0cc638200 +mtpd-2055 3.... 13759356us : async_getcompleted before spin_lock_irqsave +mtpd-2055 3d..1 13759362us : async_getcompleted after list_del_init: as=ffffffc0cc638200 +mtpd-2055 3.... 13759371us+: proc_reapurbnonblock_compat: free_async(ffffffc0cc638200) +mtpd-2055 3.... 13759422us+: async_getcompleted before spin_lock_irqsave +mtpd-2055 3.... 13759479us : usbdev_release at start: ps=ffffffc0cc042080 +mtpd-2055 3.... 13759487us : async_getcompleted before spin_lock_irqsave +mtpd-2055 3.... 13759497us!: usbdev_release after kfree(ps): ps=ffffffc0cc042080 +<...>-2104 0d.h2 13760294us : async_completed before wake_up(): as=ffffffc0cc638200 + +To fix this problem we can just move the wake_up() under the ps->lock. +There should be no issues there that I'm aware of. + +Signed-off-by: Douglas Anderson +Acked-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/core/devio.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/usb/core/devio.c ++++ b/drivers/usb/core/devio.c +@@ -519,6 +519,8 @@ static void async_completed(struct urb * + if (as->status < 0 && as->bulk_addr && as->status != -ECONNRESET && + as->status != -ENOENT) + cancel_bulk_urbs(ps, as->bulk_addr); ++ ++ wake_up(&ps->wait); + spin_unlock(&ps->lock); + + if (signr) { +@@ -526,8 +528,6 @@ static void async_completed(struct urb * + put_pid(pid); + put_cred(cred); + } +- +- wake_up(&ps->wait); + } + + static void destroy_async(struct usb_dev_state *ps, struct list_head *list)