mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

seg6: Cleanup duplicates of skb_dst_drop calls

Browse source 
In processing IPv6 segment routing header (SRH), several functions call
skb_dst_drop before ip6_route_input. However, ip6_route_input calls
skb_dst_drop within it, so there is no need to call skb_dst_drop in advance.

Signed-off-by: Yuya Tajima <yuya.tajimaa@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yuya Tajima 2023-05-15 15:34:27 +00:00 committed by David S. Miller
parent 81cf1ade0b
commit fa0583c202
2 changed files with 1 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
net/ipv6/exthdrs.c
View file

@ -458,8 +458,6 @@ static int ipv6_srh_rcv(struct sk_buff *skb)
ipv6_hdr(skb)->daddr = *addr; ipv6_hdr(skb)->daddr = *addr;
skb_dst_drop(skb);
ip6_route_input(skb); ip6_route_input(skb);
if (skb_dst(skb)->error) { if (skb_dst(skb)->error) {
@ -834,7 +832,6 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb)
*addr = ipv6_hdr(skb)->daddr; *addr = ipv6_hdr(skb)->daddr;
ipv6_hdr(skb)->daddr = daddr; ipv6_hdr(skb)->daddr = daddr;
skb_dst_drop(skb);
ip6_route_input(skb); ip6_route_input(skb);
if (skb_dst(skb)->error) { if (skb_dst(skb)->error) {
skb_push(skb, skb->data - skb_network_header(skb)); skb_push(skb, skb->data - skb_network_header(skb));

3
net/ipv6/seg6_iptunnel.c
View file

@ -470,8 +470,6 @@ static int seg6_input_core(struct net *net, struct sock *sk,
dst = dst_cache_get(&slwt->cache); dst = dst_cache_get(&slwt->cache);
preempt_enable(); preempt_enable();
skb_dst_drop(skb);
if (!dst) { if (!dst) {
ip6_route_input(skb); ip6_route_input(skb);
dst = skb_dst(skb); dst = skb_dst(skb);
@ -482,6 +480,7 @@ static int seg6_input_core(struct net *net, struct sock *sk,
preempt_enable(); preempt_enable();
} }
} else { } else {
skb_dst_drop(skb);
skb_dst_set(skb, dst); skb_dst_set(skb, dst);
} }