提交 06d5afd4 编写于 作者: D Daniel Starke 提交者: Greg Kroah-Hartman

tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2

n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010.
See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516
The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to
the newer 27.010 here. Chapter 5.5.2 describes that the signal octet in
convergence layer type 2 can be either one or two bytes. The length is
encoded in the EA bit. This is set 1 for the last byte in the sequence.
gsmtty_modem_update() handles this correctly but gsm_dlci_data_output()
fails to set EA to 1. There is no case in which we encode two signal octets
as there is no case in which we send out a break signal.
Therefore, always set the EA bit to 1 for the signal octet to fix this.

Fixes: e1eaea46 ("tty: n_gsm line discipline")
Cc: stable@vger.kernel.org
Signed-off-by: NDaniel Starke <daniel.starke@siemens.com>
Link: https://lore.kernel.org/r/20220414094225.4527-5-daniel.starke@siemens.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 284260f2
...@@ -832,7 +832,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci) ...@@ -832,7 +832,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
break; break;
case 2: /* Unstructed with modem bits. case 2: /* Unstructed with modem bits.
Always one byte as we never send inline break data */ Always one byte as we never send inline break data */
*dp++ = gsm_encode_modem(dlci); *dp++ = (gsm_encode_modem(dlci) << 1) | EA;
break; break;
} }
WARN_ON(kfifo_out_locked(&dlci->fifo, dp , len, &dlci->lock) != len); WARN_ON(kfifo_out_locked(&dlci->fifo, dp , len, &dlci->lock) != len);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册