Skip to content

Commit

Permalink
tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_ch…
Browse files Browse the repository at this point in the history
…ain/: Depth

liblockdep has been broken since commit 75dd602 ("lockdep: Fix
lock_chain::base size"), as that adds a check that MAX_LOCK_DEPTH is
within the range of lock_chain::depth and in liblockdep it is much
too large.

That should have resulted in a compiler error, but didn't because:

- the check uses ARRAY_SIZE(), which isn't yet defined in liblockdep
  so is assumed to be an (undeclared) function
- putting a function call inside a BUILD_BUG_ON() expression quietly
  turns it into some nonsense involving a variable-length array

It did produce a compiler warning, but I didn't notice because
liblockdep already produces too many warnings if -Wall is enabled
(which I'll fix shortly).

Even before that commit, which reduced lock_chain::depth from 8 bits
to 6, MAX_LOCK_DEPTH was too large.

Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
Cc: <[email protected]> # for versions before 4.6, use a value of 255
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
bwhacks authored and Ingo Molnar committed Jun 5, 2017
1 parent 3752466 commit 98dcea0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/lib/lockdep/uinclude/linux/lockdep.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <linux/utsname.h>
#include <linux/compiler.h>

#define MAX_LOCK_DEPTH 2000UL
#define MAX_LOCK_DEPTH 63UL

#define asmlinkage
#define __visible
Expand Down

0 comments on commit 98dcea0

Please sign in to comment.