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 |
|---|---|---|
| Kconfig | -rw-r--r-- | 20.0 KB |
| Kconfig.debug | -rw-r--r-- | 1015 bytes |
| Makefile | -rw-r--r-- | 2.1 KB |
| backing-dev.c | -rw-r--r-- | 16.5 KB |
| balloon_compaction.c | -rw-r--r-- | 9.7 KB |
| bootmem.c | -rw-r--r-- | 20.8 KB |
| bounce.c | -rw-r--r-- | 6.4 KB |
| cleancache.c | -rw-r--r-- | 12.7 KB |
| compaction.c | -rw-r--r-- | 33.5 KB |
| debug-pagealloc.c | -rw-r--r-- | 2.1 KB |
| dmapool.c | -rw-r--r-- | 13.1 KB |
| fadvise.c | -rw-r--r-- | 3.6 KB |
| failslab.c | -rw-r--r-- | 1.3 KB |
| filemap.c | -rw-r--r-- | 67.7 KB |
| filemap_xip.c | -rw-r--r-- | 11.3 KB |
| fremap.c | -rw-r--r-- | 6.8 KB |
| frontswap.c | -rw-r--r-- | 13.5 KB |
| highmem.c | -rw-r--r-- | 9.9 KB |
| huge_memory.c | -rw-r--r-- | 77.7 KB |
| hugetlb.c | -rw-r--r-- | 92.4 KB |
| hugetlb_cgroup.c | -rw-r--r-- | 10.2 KB |
| hwpoison-inject.c | -rw-r--r-- | 3.3 KB |
| init-mm.c | -rw-r--r-- | 619 bytes |
| internal.h | -rw-r--r-- | 11.3 KB |
| interval_tree.c | -rw-r--r-- | 3.2 KB |
| kmemcheck.c | -rw-r--r-- | 2.8 KB |
| kmemleak-test.c | -rw-r--r-- | 3.3 KB |
| kmemleak.c | -rw-r--r-- | 52.5 KB |
| ksm.c | -rw-r--r-- | 63.4 KB |
| list_lru.c | -rw-r--r-- | 3.1 KB |
| maccess.c | -rw-r--r-- | 1.6 KB |
| madvise.c | -rw-r--r-- | 14.2 KB |
| memblock.c | -rw-r--r-- | 42.9 KB |
| memcontrol.c | -rw-r--r-- | 194.1 KB |
| memory-failure.c | -rw-r--r-- | 46.4 KB |
| memory.c | -rw-r--r-- | 116.0 KB |
| memory_hotplug.c | -rw-r--r-- | 48.4 KB |
| mempolicy.c | -rw-r--r-- | 74.8 KB |
| mempool.c | -rw-r--r-- | 10.5 KB |
| migrate.c | -rw-r--r-- | 47.6 KB |
| mincore.c | -rw-r--r-- | 7.7 KB |
| mlock.c | -rw-r--r-- | 22.5 KB |
| mm_init.c | -rw-r--r-- | 5.0 KB |
| mmap.c | -rw-r--r-- | 86.2 KB |
| mmu_context.c | -rw-r--r-- | 1.2 KB |
| mmu_notifier.c | -rw-r--r-- | 9.5 KB |
| mmzone.c | -rw-r--r-- | 2.4 KB |
| mprotect.c | -rw-r--r-- | 9.7 KB |
| mremap.c | -rw-r--r-- | 14.8 KB |
| msync.c | -rw-r--r-- | 2.4 KB |
| nobootmem.c | -rw-r--r-- | 10.8 KB |
| nommu.c | -rw-r--r-- | 53.1 KB |
| oom_kill.c | -rw-r--r-- | 19.8 KB |
| page-writeback.c | -rw-r--r-- | 75.2 KB |
| page_alloc.c | -rw-r--r-- | 181.1 KB |
| page_cgroup.c | -rw-r--r-- | 11.9 KB |
| page_io.c | -rw-r--r-- | 9.0 KB |
| page_isolation.c | -rw-r--r-- | 7.5 KB |
| pagewalk.c | -rw-r--r-- | 5.9 KB |
| percpu-km.c | -rw-r--r-- | 2.8 KB |
| percpu-vm.c | -rw-r--r-- | 12.9 KB |
| percpu.c | -rw-r--r-- | 57.2 KB |
| pgtable-generic.c | -rw-r--r-- | 5.2 KB |
| process_vm_access.c | -rw-r--r-- | 13.2 KB |
| quicklist.c | -rw-r--r-- | 2.4 KB |
| readahead.c | -rw-r--r-- | 16.0 KB |
| rmap.c | -rw-r--r-- | 47.3 KB |
| shmem.c | -rw-r--r-- | 78.6 KB |
| slab.c | -rw-r--r-- | 109.8 KB |
| slab.h | -rw-r--r-- | 8.2 KB |
| slab_common.c | -rw-r--r-- | 16.2 KB |
| slob.c | -rw-r--r-- | 15.7 KB |
| slub.c | -rw-r--r-- | 126.8 KB |
| sparse-vmemmap.c | -rw-r--r-- | 6.0 KB |
| sparse.c | -rw-r--r-- | 20.9 KB |
| swap.c | -rw-r--r-- | 27.5 KB |
| swap_state.c | -rw-r--r-- | 11.5 KB |
| swapfile.c | -rw-r--r-- | 76.5 KB |
| truncate.c | -rw-r--r-- | 19.5 KB |
| util.c | -rw-r--r-- | 10.6 KB |
| vmalloc.c | -rw-r--r-- | 67.9 KB |
| vmpressure.c | -rw-r--r-- | 11.4 KB |
| vmscan.c | -rw-r--r-- | 107.2 KB |
| vmstat.c | -rw-r--r-- | 34.9 KB |
| zbud.c | -rw-r--r-- | 15.9 KB |
| zsmalloc.c | -rw-r--r-- | 28.5 KB |
| zswap.c | -rw-r--r-- | 24.1 KB |
Computing file changes ...
