Unverified Commit bdc7d729 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10001 tty: n_gsm: fix possible out-of-bounds in gsm0_receive() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cui GaoSheng <cuigaosheng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YC3GMCB2W5KI3FFS36XLZYI6K5VUXVSO/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9TAHR 
 
Link:https://gitee.com/openeuler/kernel/pulls/10001

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 33c569dd 942b4f35

drivers/tty/n_gsm.c

+5 −2
Original line number Diff line number Diff line
@@ -2912,7 +2912,10 @@ static void gsm0_receive(struct gsm_mux *gsm, unsigned char c) 
		break;

	case GSM_DATA:		/* Data */

		gsm->buf[gsm->count++] = c;

		if (gsm->count == gsm->len) {

		if (gsm->count >= MAX_MRU) {

			gsm->bad_size++;

			gsm->state = GSM_SEARCH;

		} else if (gsm->count >= gsm->len) {

			/* Calculate final FCS for UI frames over all data */

			if ((gsm->control & ~PF) != UIH) {

				gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf,
@@ -3025,7 +3028,7 @@ static void gsm1_receive(struct gsm_mux *gsm, unsigned char c) 
		gsm->state = GSM_DATA;

		break;

	case GSM_DATA:		/* Data */

		if (gsm->count > gsm->mru) {	/* Allow one for the FCS */

		if (gsm->count > gsm->mru || gsm->count > MAX_MRU) {	/* Allow one for the FCS */

			gsm->state = GSM_OVERRUN;

			gsm->bad_size++;

		} else