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

!10569 ila: block BH in ila_output() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Z5GWLJCKJYFC3RHGCCANICBEJQBVY6SH/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEMQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/10569

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents f0f580de 839b80e5

net/ipv6/ila/ila_lwt.c

+6 −1
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
		return orig_dst->lwtstate->orig_output(net, sk, skb);

	}



	local_bh_disable();

	dst = dst_cache_get(&ilwt->dst_cache);

	local_bh_enable();

	if (unlikely(!dst)) {

		struct ipv6hdr *ip6h = ipv6_hdr(skb);

		struct flowi6 fl6;
@@ -86,8 +88,11 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
			goto drop;

		}



		if (ilwt->connected)

		if (ilwt->connected) {

			local_bh_disable();

			dst_cache_set_ip6(&ilwt->dst_cache, dst, &fl6.saddr);

			local_bh_enable();

		}

	}



	skb_dst_set(skb, dst);