From: Daniel Starke Date: Fri, 1 Jul 2022 06:16:50 +0000 (+0200) Subject: tty: n_gsm: fix packet re-transmission without open control channel X-Git-Tag: baikal/mips/sdk5.9~193 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=c2399be9010f6147000370b390ace8a49f851b63;p=kernel.git tty: n_gsm: fix packet re-transmission without open control channel [ Upstream commit 2f45f991fdd64b5f60573f48b3aa881528ea32e0 ] In the current implementation control packets are re-transmitted even if the control channel closed down during T2. This is wrong. Check whether the control channel is open before re-transmitting any packets. Note that control channel open/close is handled by T1 and not T2 and remains unaffected by this. Fixes: 99551fa31543 ("tty: n_gsm line discipline") Signed-off-by: Daniel Starke Link: https://lore.kernel.org/r/20220701061652.39604-7-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 56a3466acfc63..3f65990fc959f 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -1546,7 +1546,7 @@ static void gsm_control_retransmit(struct timer_list *t) spin_lock_irqsave(&gsm->control_lock, flags); ctrl = gsm->pending_cmd; if (ctrl) { - if (gsm->cretries == 0) { + if (gsm->cretries == 0 || !gsm->dlci[0] || gsm->dlci[0]->dead) { gsm->pending_cmd = NULL; ctrl->error = -ETIMEDOUT; ctrl->done = 1;