diff options
| author | Anton Blanchard <anton@samba.org> | 2014-11-11 09:12:28 +1100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-26 14:38:43 +0100 |
| commit | c6fdf6dc5e74d008ca8db8c4f7a579a94186c85f (patch) | |
| tree | 92858394554f304176ca2927daf6e6c47de1c9dc /arch | |
| parent | e3ab75edf0292a413a45448b993775ba4cc4dbd9 (diff) | |
| download | lwn-c6fdf6dc5e74d008ca8db8c4f7a579a94186c85f.tar.gz lwn-c6fdf6dc5e74d008ca8db8c4f7a579a94186c85f.zip | |
powerpc: Fix bad NULL pointer check in udbg_uart_getc_poll()
commit cd32e2dcc9de6c27ecbbfc0e2079fb64b42bad5f upstream.
We have some code in udbg_uart_getc_poll() that tries to protect
against a NULL udbg_uart_in, but gets it all wrong.
Found with the LLVM static analyzer (scan-build).
Fixes: 309257484cc1 ("powerpc: Cleanup udbg_16550 and add support for LPC PIO-only UARTs")
Signed-off-by: Anton Blanchard <anton@samba.org>
[mpe: Add some newlines for readability while we're here]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/udbg_16550.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c index 75702e207b29..f7089fcfaa5d 100644 --- a/arch/powerpc/kernel/udbg_16550.c +++ b/arch/powerpc/kernel/udbg_16550.c @@ -69,8 +69,12 @@ static void udbg_uart_putc(char c) static int udbg_uart_getc_poll(void) { - if (!udbg_uart_in || !(udbg_uart_in(UART_LSR) & LSR_DR)) + if (!udbg_uart_in) + return -1; + + if (!(udbg_uart_in(UART_LSR) & LSR_DR)) return udbg_uart_in(UART_RBR); + return -1; } |