summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-05-03 14:01:51 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-03 17:53:20 -0700
commit7da4b8b7378790dd1e4af1bb7522863127fa1438 (patch)
treea541a0973b6a7699f0df6749d028a8760560564f /drivers/tty
parent6550be9f62bfc4dacbdbd8cb7afe0df661da77bf (diff)
serial: core: Fix port mutex assert if lockdep disabled
commit 4047b37122d1 ("serial: core: Prevent unsafe uart port access, part 1") added lockdep assertion for port mutex but fails to check if debug_locks has disabled lockdep (so lock state is no longer reliable). Use lockdep_assert_held() instead, which properly checks lockdep state as well. Reported-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Tested-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/serial_core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index d529b5ce66c7..a333c59cba2c 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -95,9 +95,7 @@ static inline void uart_port_deref(struct uart_port *uport)
static inline struct uart_port *uart_port_check(struct uart_state *state)
{
-#ifdef CONFIG_LOCKDEP
- WARN_ON(!lockdep_is_held(&state->port.mutex));
-#endif
+ lockdep_assert_held(&state->port.mutex);
return state->uart_port;
}