The patch titled hiddev: fix waitqueue usage has been added to the -mm tree. Its filename is hiddev-fix-waitqueue-usage.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hiddev: fix waitqueue usage From: Johannes Weiner <hannes@xxxxxxxxxxx> DECLARE_WAITQUEUE doesn't initialize the wait descriptor's task_list to 'empty' but to zero. prepare_to_wait() will not enqueue the descriptor to the waitqueue and finish_wait() will do list_del_init() on a list head that contains NULL pointers, which oopses. This was introduced by 079034073 "HID: hiddev cleanup -- handle all error conditions properly". The prior code used an unconditional add_to_waitqueue() which didn't care about the wait descriptor's list head and enqueued the thing unconditionally. The new code uses prepare_to_wait() which DOES check the prior list state, so use DEFINE_WAIT instead. Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Oliver Neukum <oliver@xxxxxxxxxxx> Cc: Jiri Kosina <jkosina@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/hid/usbhid/hiddev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/hid/usbhid/hiddev.c~hiddev-fix-waitqueue-usage drivers/hid/usbhid/hiddev.c --- a/drivers/hid/usbhid/hiddev.c~hiddev-fix-waitqueue-usage +++ a/drivers/hid/usbhid/hiddev.c @@ -333,7 +333,7 @@ static ssize_t hiddev_write(struct file */ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t count, loff_t *ppos) { - DECLARE_WAITQUEUE(wait, current); + DEFINE_WAIT(wait); struct hiddev_list *list = file->private_data; int event_size; int retval; _ Patches currently in -mm which might be from hannes@xxxxxxxxxxx are linux-next.patch cifs-use-kzfree.patch s390-use-kzfree.patch usb-use-kzfree.patch crypto-use-kzfree.patch hiddev-fix-incorrect-free.patch hiddev-fix-waitqueue-usage.patch vmscan-rename-scmay_swap-to-may_unmap.patch mm-introduce-for_each_populated_zone-macro.patch mm-introduce-for_each_populated_zone-macro-cleanup.patch mm-shrink_all_memory-use-scnr_reclaimed.patch mm-shrink_all_memory-use-scnr_reclaimed-checkpatch-fixes.patch vmscan-clip-swap_cluster_max-in-shrink_all_memory.patch vmscan-respect-higher-order-in-zone_reclaim.patch mm-move-pagevec-stripping-to-save-unlock-relock.patch mm-dont-free-swap-slots-on-page-deactivation.patch mm-remove-pagevec_swap_free.patch ecryptfs-use-kzfree.patch memcg-remove-mem_cgroup_calc_mapped_ratio-take2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html