Commit f37ac5a1 authored by Mikhail Kshevetskiy's avatar Mikhail Kshevetskiy Committed by Greg Kroah-Hartman

tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)

in adaption=2 case we should put 1 or 2 byte with modem status bits
at the beginning of a buffer pointed by "dp". n_gsm use 1 byte case,
so it allocate a buffer of len + 1 size. As result we should:
  * put 1 byte of modem status bits
  * increase data pointer
  * put "len" bytes of data
but actually we have:
  * increase first byte with the value of modem status bits
  * decrease "len"
  * put orig_len - 1 bytes of data starting from the buffer beggining
This is evidently wrong.
Signed-off-by: default avatarMikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7808a4c4
...@@ -833,8 +833,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci) ...@@ -833,8 +833,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
break; break;
case 2: /* Unstructed with modem bits. Always one byte as we never case 2: /* Unstructed with modem bits. Always one byte as we never
send inline break data */ send inline break data */
*dp += gsm_encode_modem(dlci); *dp++ = gsm_encode_modem(dlci);
len--;
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%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment