Commit de35b02b authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Jialin Zhang
Browse files

net/af_packet: check len when min_header_len equals to 0 

stable inclusion
from stable-v5.10.141
commit 4931af31c402b20c528b43d90f98bc6f4bcb5810
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I685FC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4931af31c402b20c528b43d90f98bc6f4bcb5810



--------------------------------

commit dc633700 upstream.

User can use AF_PACKET socket to send packets with the length of 0.
When min_header_len equals to 0, packet_snd will call __dev_queue_xmit
to send packets, and sock->type can be any type.

Reported-by: default avatar <syzbot+5ea725c25d06fb9114c4@syzkaller.appspotmail.com>
Fixes: fd189422 ("bpf: Don't redirect packets with invalid pkt_len")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent eb6b523c

net/packet/af_packet.c

+2 −2
Original line number Diff line number Diff line
@@ -2996,8 +2996,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) 
	if (err)

		goto out_free;



	if (sock->type == SOCK_RAW &&

	    !dev_validate_header(dev, skb->data, len)) {

	if ((sock->type == SOCK_RAW &&

	     !dev_validate_header(dev, skb->data, len)) || !skb->len) {

		err = -EINVAL;

		goto out_free;

	}