Merge "diag: Add NULL pointer checks for upd buffer" (35a52818) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/char/diag/diagfwd_peripheral.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -476,7 +476,8 @@ static void diagfwd_data_read_untag_done(struct diagfwd_info *fwd_info,
	flag_buf_1 = 1;		flag_buf_1 = 1;
	temp_fwdinfo_cpd = fwd_info->buf_1;		temp_fwdinfo_cpd = fwd_info->buf_1;
	if (fwd_info->type == TYPE_DATA) {		if (fwd_info->type == TYPE_DATA) {
	for (i = 0; i <= (fwd_info->num_pd - 2); i++)		for (i = 0; (i <= (fwd_info->num_pd - 2)) &&
			fwd_info->buf_upd[i][0]; i++)
	temp_buf_upd[i] =		temp_buf_upd[i] =
	fwd_info->buf_upd[i][0]->data_raw;		fwd_info->buf_upd[i][0]->data_raw;
	}		}
	@@ -485,7 +486,8 @@ static void diagfwd_data_read_untag_done(struct diagfwd_info *fwd_info,
	flag_buf_2 = 1;		flag_buf_2 = 1;
	temp_fwdinfo_cpd = fwd_info->buf_2;		temp_fwdinfo_cpd = fwd_info->buf_2;
	if (fwd_info->type == TYPE_DATA) {		if (fwd_info->type == TYPE_DATA) {
	for (i = 0; i <= (fwd_info->num_pd - 2); i++)		for (i = 0; (i <= (fwd_info->num_pd - 2)) &&
			fwd_info->buf_upd[i][1]; i++)
	temp_buf_upd[i] =		temp_buf_upd[i] =
	fwd_info->buf_upd[i][1]->data_raw;		fwd_info->buf_upd[i][1]->data_raw;
	}		}
	@@ -555,6 +557,8 @@ static void diagfwd_data_read_untag_done(struct diagfwd_info *fwd_info,
	else		else
	temp_fwdinfo_upd =		temp_fwdinfo_upd =
	fwd_info->buf_upd[i][1];		fwd_info->buf_upd[i][1];
			if (!temp_fwdinfo_upd)
			break;
	temp_fwdinfo_upd->ctxt &= 0x00FFFFFF;		temp_fwdinfo_upd->ctxt &= 0x00FFFFFF;
	temp_fwdinfo_upd->ctxt \|=		temp_fwdinfo_upd->ctxt \|=
	(SET_PD_CTXT(ctxt_upd[i]));		(SET_PD_CTXT(ctxt_upd[i]));