diff options
author | Eric Dumazet <edumazet@google.com> | 2019-10-19 18:26:37 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-10-21 19:46:42 +0200 |
commit | e7a409c3f46cb0dbc7bfd4f6f9421d53e92614a5 (patch) | |
tree | 1a87acde604b1a6eaacb4a7c87fbf5342923e659 /include | |
parent | Merge tag 'mlx5-fixes-2019-10-18' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
download | linux-e7a409c3f46cb0dbc7bfd4f6f9421d53e92614a5.tar.xz linux-e7a409c3f46cb0dbc7bfd4f6f9421d53e92614a5.zip |
ipv4: fix IPSKB_FRAG_PMTU handling with fragmentation
This patch removes the iph field from the state structure, which is not
properly initialized. Instead, add a new field to make the "do we want
to set DF" be the state bit and move the code to set the DF flag from
ip_frag_next().
Joint work with Pablo and Linus.
Fixes: 19c3401a917b ("net: ipv4: place control buffer handling away from fragmentation iterators")
Reported-by: Patrick Schönthaler <patrick@notvads.ovh>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/ip.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 95bb77f95bcc..a2c61c36dc4a 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -185,7 +185,7 @@ static inline struct sk_buff *ip_fraglist_next(struct ip_fraglist_iter *iter) } struct ip_frag_state { - struct iphdr *iph; + bool DF; unsigned int hlen; unsigned int ll_rs; unsigned int mtu; @@ -196,7 +196,7 @@ struct ip_frag_state { }; void ip_frag_init(struct sk_buff *skb, unsigned int hlen, unsigned int ll_rs, - unsigned int mtu, struct ip_frag_state *state); + unsigned int mtu, bool DF, struct ip_frag_state *state); struct sk_buff *ip_frag_next(struct sk_buff *skb, struct ip_frag_state *state); |