summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/jsm
diff options
context:
space:
mode:
authorGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>2017-12-22 19:31:39 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-09 18:37:03 +0300
commite50af488dddea7754e581d69bf978356e468845c (patch)
tree193978b60735a8234130576da1de6688b7e2eb93 /drivers/tty/serial/jsm
parent8ca31ba8bb3441dd9928d2f92ffeee11dd2b6e63 (diff)
downloadlinux-e50af488dddea7754e581d69bf978356e468845c.tar.xz
tty: serial: jsm: Add one check against NULL pointer dereference
All calls to neo_copy_data_from_uart_to_queue() are safeguarded against NULL dereference of its parameter, except the one that this patch changes. That said, let's play safe and check for NULL in this case too. Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/jsm')
-rw-r--r--drivers/tty/serial/jsm/jsm_neo.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index 6fa9a54b2454..bf0e2a4cb0ce 100644
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -1172,6 +1172,9 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
continue;
ch = brd->channels[port];
+ if (!ch)
+ continue;
+
neo_copy_data_from_uart_to_queue(ch);
/* Call our tty layer to enforce queue flow control if needed. */