diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-10 23:24:19 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-10 23:24:19 +0300 |
| commit | c89489b47289e222c4363c20515e0ac321acbae4 (patch) | |
| tree | 074cf794103afa706dd6cedc5d2236969b5bd04c /include/net | |
| parent | 05a59d79793d482f628a31753c671f2e92178a21 (diff) | |
| parent | a188bb5638d41aa99090ebf2f85d3505ab13fba5 (diff) | |
| download | linux-c89489b47289e222c4363c20515e0ac321acbae4.tar.xz | |
Merge branch 'ip6ip6-crash'
Daniel Borkmann says:
====================
Fix ip6ip6 crash for collect_md skbs
Fix a NULL pointer deref panic I ran into for regular ip6ip6 tunnel devices
when collect_md populated skbs were redirected to them for xmit. See patches
for further details, thanks!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/dst.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 26f134ad3a25..75b1e734e9c2 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -550,4 +550,15 @@ static inline void skb_dst_update_pmtu_no_confirm(struct sk_buff *skb, u32 mtu) dst->ops->update_pmtu(dst, NULL, skb, mtu, false); } +struct dst_entry *dst_blackhole_check(struct dst_entry *dst, u32 cookie); +void dst_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk, + struct sk_buff *skb, u32 mtu, bool confirm_neigh); +void dst_blackhole_redirect(struct dst_entry *dst, struct sock *sk, + struct sk_buff *skb); +u32 *dst_blackhole_cow_metrics(struct dst_entry *dst, unsigned long old); +struct neighbour *dst_blackhole_neigh_lookup(const struct dst_entry *dst, + struct sk_buff *skb, + const void *daddr); +unsigned int dst_blackhole_mtu(const struct dst_entry *dst); + #endif /* _NET_DST_H */ |