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
History
File Mode Size
Kconfig -rw-r--r-- 7.2 KB
Makefile -rw-r--r-- 1.9 KB
ca0132_regs.h -rw-r--r-- 14.0 KB
hda_auto_parser.c -rw-r--r-- 24.1 KB
hda_auto_parser.h -rw-r--r-- 3.5 KB
hda_beep.c -rw-r--r-- 7.3 KB
hda_beep.h -rw-r--r-- 1.7 KB
hda_codec.c -rw-r--r-- 152.8 KB
hda_codec.h -rw-r--r-- 20.7 KB
hda_eld.c -rw-r--r-- 22.4 KB
hda_generic.c -rw-r--r-- 144.1 KB
hda_generic.h -rw-r--r-- 11.5 KB
hda_hwdep.c -rw-r--r-- 20.9 KB
hda_i915.c -rw-r--r-- 1.8 KB
hda_i915.h -rw-r--r-- 1.1 KB
hda_intel.c -rw-r--r-- 113.7 KB
hda_intel_trace.h -rw-r--r-- 1.3 KB
hda_jack.c -rw-r--r-- 14.4 KB
hda_jack.h -rw-r--r-- 3.4 KB
hda_local.h -rw-r--r-- 25.2 KB
hda_proc.c -rw-r--r-- 24.9 KB
hda_trace.h -rw-r--r-- 2.9 KB
patch_analog.c -rw-r--r-- 29.4 KB
patch_ca0110.c -rw-r--r-- 2.9 KB
patch_ca0132.c -rw-r--r-- 123.5 KB
patch_cirrus.c -rw-r--r-- 31.9 KB
patch_cmedia.c -rw-r--r-- 19.3 KB
patch_conexant.c -rw-r--r-- 108.4 KB
patch_hdmi.c -rw-r--r-- 93.6 KB
patch_realtek.c -rw-r--r-- 158.2 KB
patch_si3054.c -rw-r--r-- 9.7 KB
patch_sigmatel.c -rw-r--r-- 132.7 KB
patch_via.c -rw-r--r-- 51.6 KB
thinkpad_helper.c -rw-r--r-- 2.6 KB

back to top