tty: n_gsm: fix packet re-transmission without open control channel
[ Upstream commit4fae831b3a
] 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:e1eaea46bb
("tty: n_gsm line discipline") Signed-off-by: Daniel Starke <daniel.starke@siemens.com> Link: https://lore.kernel.org/r/20220701061652.39604-7-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
2012b064f9
commit
51556905dd
@ -1532,7 +1532,7 @@ static void gsm_control_retransmit(struct timer_list *t)
|
|||||||
spin_lock_irqsave(&gsm->control_lock, flags);
|
spin_lock_irqsave(&gsm->control_lock, flags);
|
||||||
ctrl = gsm->pending_cmd;
|
ctrl = gsm->pending_cmd;
|
||||||
if (ctrl) {
|
if (ctrl) {
|
||||||
if (gsm->cretries == 0) {
|
if (gsm->cretries == 0 || !gsm->dlci[0] || gsm->dlci[0]->dead) {
|
||||||
gsm->pending_cmd = NULL;
|
gsm->pending_cmd = NULL;
|
||||||
ctrl->error = -ETIMEDOUT;
|
ctrl->error = -ETIMEDOUT;
|
||||||
ctrl->done = 1;
|
ctrl->done = 1;
|
||||||
|
Reference in New Issue
Block a user