Revision da9846ae15186d491d6e21ebbb5051e1d3c7f652 authored by Tejun Heo on 29 January 2014, 17:04:03 UTC, committed by Greg Kroah-Hartman on 05 February 2014, 19:44:04 UTC
kernfs_deactivate() forgot to check whether KERNFS_LOCKDEP is set before performing lockdep annotations and ends up feeding uninitialized lockdep_map to lockdep triggering warning like the following on USB stick hotunplug. usb 1-2: USB disconnect, device number 2 INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. CPU: 1 PID: 62 Comm: khubd Not tainted 3.13.0-work+ #82 Hardware name: empty empty/S3992, BIOS 080011 10/26/2007 ffff880065ca7f60 ffff88013a4ffa08 ffffffff81cfb6bd 0000000000000002 ffff88013a4ffac8 ffffffff810f8530 ffff88013a4fc710 0000000000000002 ffff880100000000 ffffffff82a3db50 0000000000000001 ffff88013a4fc710 Call Trace: [<ffffffff81cfb6bd>] dump_stack+0x4e/0x7a [<ffffffff810f8530>] __lock_acquire+0x1910/0x1e70 [<ffffffff810f931a>] lock_acquire+0x9a/0x1d0 [<ffffffff8127c75e>] kernfs_deactivate+0xee/0x130 [<ffffffff8127d4c8>] kernfs_addrm_finish+0x38/0x60 [<ffffffff8127d701>] kernfs_remove_by_name_ns+0x51/0xa0 [<ffffffff8127b4f1>] remove_files.isra.1+0x41/0x80 [<ffffffff8127b7e7>] sysfs_remove_group+0x47/0xa0 [<ffffffff8127b873>] sysfs_remove_groups+0x33/0x50 [<ffffffff8177d66d>] device_remove_attrs+0x4d/0x80 [<ffffffff8177e25e>] device_del+0x12e/0x1d0 [<ffffffff819722c2>] usb_disconnect+0x122/0x1a0 [<ffffffff819749b5>] hub_thread+0x3c5/0x1290 [<ffffffff810c6a6d>] kthread+0xed/0x110 [<ffffffff81d0a56c>] ret_from_fork+0x7c/0xb0 Fix it by making kernfs_deactivate() perform lockdep annotations only if KERNFS_LOCKDEP is set. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Fabio Estevam <festevam@gmail.com> Reported-by: Alan Stern <stern@rowland.harvard.edu> Reported-by: Jiri Kosina <jkosina@suse.cz> Reported-by: Dave Jones <davej@redhat.com> Tested-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 38dbfb5
| File | Mode | Size |
|---|---|---|
| oss | ||
| seq | ||
| Kconfig | -rw-r--r-- | 6.2 KB |
| Makefile | -rw-r--r-- | 1.2 KB |
| compress_offload.c | -rw-r--r-- | 25.7 KB |
| control.c | -rw-r--r-- | 44.2 KB |
| control_compat.c | -rw-r--r-- | 11.5 KB |
| ctljack.c | -rw-r--r-- | 1.5 KB |
| device.c | -rw-r--r-- | 6.6 KB |
| hrtimer.c | -rw-r--r-- | 4.1 KB |
| hwdep.c | -rw-r--r-- | 13.4 KB |
| hwdep_compat.c | -rw-r--r-- | 2.3 KB |
| info.c | -rw-r--r-- | 22.6 KB |
| info_oss.c | -rw-r--r-- | 3.8 KB |
| init.c | -rw-r--r-- | 25.3 KB |
| isadma.c | -rw-r--r-- | 3.0 KB |
| jack.c | -rw-r--r-- | 6.6 KB |
| memalloc.c | -rw-r--r-- | 7.5 KB |
| memory.c | -rw-r--r-- | 2.5 KB |
| misc.c | -rw-r--r-- | 3.9 KB |
| pcm.c | -rw-r--r-- | 33.9 KB |
| pcm_compat.c | -rw-r--r-- | 15.1 KB |
| pcm_dmaengine.c | -rw-r--r-- | 11.0 KB |
| pcm_lib.c | -rw-r--r-- | 70.1 KB |
| pcm_memory.c | -rw-r--r-- | 13.5 KB |
| pcm_misc.c | -rw-r--r-- | 14.4 KB |
| pcm_native.c | -rw-r--r-- | 94.9 KB |
| pcm_timer.c | -rw-r--r-- | 3.7 KB |
| rawmidi.c | -rw-r--r-- | 47.8 KB |
| rawmidi_compat.c | -rw-r--r-- | 3.5 KB |
| rtctimer.c | -rw-r--r-- | 4.1 KB |
| sgbuf.c | -rw-r--r-- | 4.2 KB |
| sound.c | -rw-r--r-- | 11.9 KB |
| sound_oss.c | -rw-r--r-- | 7.6 KB |
| timer.c | -rw-r--r-- | 50.8 KB |
| timer_compat.c | -rw-r--r-- | 3.5 KB |
| vmaster.c | -rw-r--r-- | 12.7 KB |
Computing file changes ...
