Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tty: n_gsm: Modify cr bit value when config requester

Browse Source 
When n_gsm config "initiator=0",as requester,gsmld will receive dlci
SABM and DISC control command frame,the CR bit value should be 1.

If cr == 0,it will goto invalid,and it can't send UA response
frame and open requster dlci.

        case SABM|PF:
-               if (cr == 0)
+               if (cr == 0) {
+                       printk("gsm_queue invalid\n");
                        goto invalid;
+                       }

Example,gsmld receive dlc0 SABM command frame:f9 03 3f 01 1c f9
but gsmld goto invalid.

Kernel test log:
[  101.794705] c0 gsmld_receive: 00000000: f9 03 3f 01 1c f9
[  101.803341] c0 <-- 0) C: SABM(P)
[  101.811371] c0 gsm_queue invalid

Signed-off-by: Zhenguo Zhao <Zhenguo.Zhao1@unisoc.com>
Link: https://lore.kernel.org/r/1629461872-26965-2-git-send-email-zhenguo6858@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Zhenguo Zhao 2021-08-20 20:17:46 +08:00 committed by Greg Kroah-Hartman
parent b9e851cd4a
commit cd93662137
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/tty/n_gsm.c
View File

@ -1779,7 +1779,7 @@ static void gsm_queue(struct gsm_mux *gsm)
switch (gsm->control) { switch (gsm->control) {
case SABM|PF: case SABM|PF:
if (cr == 0) if (cr == 1)
goto invalid; goto invalid;
if (dlci == NULL) if (dlci == NULL)
dlci = gsm_dlci_alloc(gsm, address); dlci = gsm_dlci_alloc(gsm, address);
@ -1793,7 +1793,7 @@ static void gsm_queue(struct gsm_mux *gsm)
} }
break; break;
case DISC|PF: case DISC|PF:
if (cr == 0) if (cr == 1)
goto invalid; goto invalid;
if (dlci == NULL || dlci->state == DLCI_CLOSED) { if (dlci == NULL || dlci->state == DLCI_CLOSED) {
gsm_response(gsm, address, DM); gsm_response(gsm, address, DM);