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

!6077 [sync] PR-5973: EDAC/thunderx: Fix possible out-of-bounds string access 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5973 
 
PR sync from: Lu Jialin <lujialin4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KZJBWOZOXFETEM2SKCXMEHHYYC3PR6ID/ 
 
https://gitee.com/src-openeuler/kernel/issues/I93EBW 
 
Link:https://gitee.com/openeuler/kernel/pulls/6077

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1e4b7577 28cde8f7

drivers/edac/thunderx_edac.c

+5 −5
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id) 
		decode_register(other, OCX_OTHER_SIZE,

				ocx_com_errors, ctx->reg_com_int);



		strncat(msg, other, OCX_MESSAGE_SIZE);

		strlcat(msg, other, OCX_MESSAGE_SIZE);



		for (lane = 0; lane < OCX_RX_LANES; lane++)

			if (ctx->reg_com_int & BIT(lane)) {
@@ -1142,12 +1142,12 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id) 
					 lane, ctx->reg_lane_int[lane],

					 lane, ctx->reg_lane_stat11[lane]);



				strncat(msg, other, OCX_MESSAGE_SIZE);

				strlcat(msg, other, OCX_MESSAGE_SIZE);



				decode_register(other, OCX_OTHER_SIZE,

						ocx_lane_errors,

						ctx->reg_lane_int[lane]);

				strncat(msg, other, OCX_MESSAGE_SIZE);

				strlcat(msg, other, OCX_MESSAGE_SIZE);

			}



		if (ctx->reg_com_int & OCX_COM_INT_CE)
@@ -1217,7 +1217,7 @@ static irqreturn_t thunderx_ocx_lnk_threaded_isr(int irq, void *irq_id) 
		decode_register(other, OCX_OTHER_SIZE,

				ocx_com_link_errors, ctx->reg_com_link_int);



		strncat(msg, other, OCX_MESSAGE_SIZE);

		strlcat(msg, other, OCX_MESSAGE_SIZE);



		if (ctx->reg_com_link_int & OCX_COM_LINK_INT_UE)

			edac_device_handle_ue(ocx->edac_dev, 0, 0, msg);
@@ -1896,7 +1896,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id) 


		decode_register(other, L2C_OTHER_SIZE, l2_errors, ctx->reg_int);



		strncat(msg, other, L2C_MESSAGE_SIZE);

		strlcat(msg, other, L2C_MESSAGE_SIZE);



		if (ctx->reg_int & mask_ue)

			edac_device_handle_ue(l2c->edac_dev, 0, 0, msg);