Skip to content

Commit 47388e8

Browse files
dstarke-siemensgregkh
authored andcommitted
tty: n_gsm: fix possible out-of-bounds in gsm0_receive()
Assuming the following: - side A configures the n_gsm in basic option mode - side B sends the header of a basic option mode frame with data length 1 - side A switches to advanced option mode - side B sends 2 data bytes which exceeds gsm->len Reason: gsm->len is not used in advanced option mode. - side A switches to basic option mode - side B keeps sending until gsm0_receive() writes past gsm->buf Reason: Neither gsm->state nor gsm->len have been reset after reconfiguration. Fix this by changing gsm->count to gsm->len comparison from equal to less than. Also add upper limit checks against the constant MAX_MRU in gsm0_receive() and gsm1_receive() to harden against memory corruption of gsm->len and gsm->mru. All other checks remain as we still need to limit the data according to the user configuration and actual payload size. Reported-by: [email protected] Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218708 Tested-by: [email protected] Fixes: e1eaea4 ("tty: n_gsm line discipline") Cc: [email protected] Signed-off-by: Daniel Starke <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ed30a4a commit 47388e8

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/tty/n_gsm.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2913,7 +2913,10 @@ static void gsm0_receive(struct gsm_mux *gsm, u8 c)
29132913
break;
29142914
case GSM_DATA: /* Data */
29152915
gsm->buf[gsm->count++] = c;
2916-
if (gsm->count == gsm->len) {
2916+
if (gsm->count >= MAX_MRU) {
2917+
gsm->bad_size++;
2918+
gsm->state = GSM_SEARCH;
2919+
} else if (gsm->count >= gsm->len) {
29172920
/* Calculate final FCS for UI frames over all data */
29182921
if ((gsm->control & ~PF) != UIH) {
29192922
gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf,
@@ -3026,7 +3029,7 @@ static void gsm1_receive(struct gsm_mux *gsm, u8 c)
30263029
gsm->state = GSM_DATA;
30273030
break;
30283031
case GSM_DATA: /* Data */
3029-
if (gsm->count > gsm->mru) { /* Allow one for the FCS */
3032+
if (gsm->count > gsm->mru || gsm->count > MAX_MRU) { /* Allow one for the FCS */
30303033
gsm->state = GSM_OVERRUN;
30313034
gsm->bad_size++;
30323035
} else

0 commit comments

Comments
 (0)