提交 5371219d 编写于 作者: D Daniel Starke 提交者: Zheng Zengkai

tty: n_gsm: fix packet re-transmission without open control channel

stable inclusion
from stable-v5.10.137
commit 2466486cae0a7cc8093f35c063d886eb9433a71c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2466486cae0a7cc8093f35c063d886eb9433a71c

--------------------------------

[ Upstream commit 4fae831b ]

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: e1eaea46 ("tty: n_gsm line discipline")
Signed-off-by: NDaniel Starke <daniel.starke@siemens.com>
Link: https://lore.kernel.org/r/20220701061652.39604-7-daniel.starke@siemens.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 1be17d79
...@@ -1388,7 +1388,7 @@ static void gsm_control_retransmit(struct timer_list *t) ...@@ -1388,7 +1388,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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册