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

!9344 round lts patches 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/K57RLHHXXCRJ5DKKZCEXOSQWBG7FVFR3/ 
Round lts patches.

David Bauer (1):
  net l2tp: drop flow hash on forward

Felix Fietkau (2):
  net: bridge: fix multicast-to-unicast with fraglist GSO
  net: bridge: fix corrupted ethernet header on multicast-to-unicast

linke li (1):
  net: mark racy access on sk->sk_rcvbuf


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/IA7IEQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/9344

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 07959444 c9ce1ede

net/bridge/br_forward.c

+7 −2
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, 
{

	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;

	const unsigned char *src = eth_hdr(skb)->h_source;

	struct sk_buff *nskb;



	if (!should_deliver(p, skb))

		return;
@@ -259,12 +260,16 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, 
	if (skb->dev == p->dev && ether_addr_equal(src, addr))

		return;



	skb = skb_copy(skb, GFP_ATOMIC);

	if (!skb) {

	__skb_push(skb, ETH_HLEN);

	nskb = pskb_copy(skb, GFP_ATOMIC);

	__skb_pull(skb, ETH_HLEN);

	if (!nskb) {

		DEV_STATS_INC(dev, tx_dropped);

		return;

	}



	skb = nskb;

	__skb_pull(skb, ETH_HLEN);

	if (!is_broadcast_ether_addr(addr))

		memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);

net/core/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	unsigned long flags;

	struct sk_buff_head *list = &sk->sk_receive_queue;



	if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {

	if (atomic_read(&sk->sk_rmem_alloc) >= READ_ONCE(sk->sk_rcvbuf)) {

		atomic_inc(&sk->sk_drops);

		trace_sock_rcvqueue_full(sk, skb);

		return -ENOMEM;
@@ -456,7 +456,7 @@ int __sk_receive_skb(struct sock *sk, struct sk_buff *skb, 


	skb->dev = NULL;



	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {

	if (sk_rcvqueues_full(sk, READ_ONCE(sk->sk_rcvbuf))) {

		atomic_inc(&sk->sk_drops);

		goto discard_and_relse;

	}

net/l2tp/l2tp_eth.c

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb, 
	/* checksums verified by L2TP */

	skb->ip_summed = CHECKSUM_NONE;



	/* drop outer flow-hash */

	skb_clear_hash(skb);



	skb_dst_drop(skb);

	nf_reset(skb);