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

!10669 fix CVE-2024-42076 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QSSWZTIEGXWATX5O4XIDYWXKU6SOLV4Q/ 
Fix CVE-2024-42076

Oliver Hartkopp (1):
  can: j1939: j1939_send_one(): fix missing CAN header initialization

Shigeru Yoshida (1):
  net: can: j1939: Initialize unused data in j1939_send_one()


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAGEOP 
 
Link:https://gitee.com/openeuler/kernel/pulls/10669

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 3fc5409f 520758d1

net/can/j1939/main.c

+4 −5
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ MODULE_ALIAS("can-proto-" __stringify(CAN_J1939)); 
/* CAN_HDR: #bytes before can_frame data part */

#define J1939_CAN_HDR (offsetof(struct can_frame, data))



/* CAN_FTR: #bytes beyond data part */

#define J1939_CAN_FTR (sizeof(struct can_frame) - J1939_CAN_HDR - \

		 sizeof(((struct can_frame *)0)->data))



/* lowest layer */

static void j1939_can_recv(struct sk_buff *iskb, void *data)

{
@@ -332,8 +328,11 @@ int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb) 
	/* re-claim the CAN_HDR from the SKB */

	cf = skb_push(skb, J1939_CAN_HDR);



	/* initialize header structure */

	memset(cf, 0, J1939_CAN_HDR);



	/* make it a full can frame again */

	skb_put(skb, J1939_CAN_FTR + (8 - dlc));

	skb_put_zero(skb, 8 - dlc);



	canid = CAN_EFF_FLAG |

		(skcb->priority << 26) |