summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorMatwey V. Kornilov <matwey@sai.msu.ru>2016-02-19 08:29:10 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-07 16:11:14 -0800
commitb18a183eaac25bd8dc51eab85437c7253f5c31d1 (patch)
tree05a585eaed87435fa6a845840b602d8bb69f59f9 /drivers/tty
parentbf2a0be45ffc5ab706f9be71a2cdc3f4600cb444 (diff)
downloadlinux-stable-b18a183eaac25bd8dc51eab85437c7253f5c31d1.tar.gz
linux-stable-b18a183eaac25bd8dc51eab85437c7253f5c31d1.tar.bz2
linux-stable-b18a183eaac25bd8dc51eab85437c7253f5c31d1.zip
tty: serial: Use GFP_ATOMIC instead of GFP_KERNEL in serial8250_em485_init()
serial8250_em485_init() is supposed to be protected with p->port.lock spinlock. This may lead to issues when kmalloc sleeps, so it is better to use GFP_ATOMIC in this spinlocked context. Fixes: e490c9144cfa ("tty: Add software emulated RS485 support for 8250") Reported-by: Ильяс Гасанов <torso.nafi@gmail.com> Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250/8250_port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index e376cfaf8ab7..2ffda79a462a 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -588,7 +588,7 @@ int serial8250_em485_init(struct uart_8250_port *p)
if (p->em485 != NULL)
return 0;
- p->em485 = kmalloc(sizeof(struct uart_8250_em485), GFP_KERNEL);
+ p->em485 = kmalloc(sizeof(struct uart_8250_em485), GFP_ATOMIC);
if (p->em485 == NULL)
return -ENOMEM;