diff options
| author | Darrell Ball <dlu998@gmail.com> | 2019-02-25 15:07:00 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-02-25 15:54:41 -0800 |
| commit | 07a17f67f77d961fa69061116b680e1158cb3528 (patch) | |
| tree | ce647c0ba68e6d89a597254265e4d8fd515e1b9c | |
| parent | 87243b0a845829f1aebce754950de9a23a4397aa (diff) | |
| download | openvswitch-07a17f67f77d961fa69061116b680e1158cb3528.tar.gz | |
conntrack: Fix L4 csum for V6 extension hdr pkts.
It is a day one issue that got copied to subsequent code.
Fixes: a489b16854b5 ("conntrack: New userspace connection tracker.")
CC: Daniele Di Proietto <diproiettod@ovn.org>
Signed-off-by: Darrell Ball <dlu998@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
| -rw-r--r-- | lib/conntrack.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/conntrack.c b/lib/conntrack.c index 1917fd8d9..2f2e6a372 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -603,19 +603,14 @@ static inline bool checksum_valid(const struct conn_key *key, const void *data, size_t size, const void *l3) { - uint32_t csum = 0; - if (key->dl_type == htons(ETH_TYPE_IP)) { - csum = packet_csum_pseudoheader(l3); + uint32_t csum = packet_csum_pseudoheader(l3); + return csum_finish(csum_continue(csum, data, size)) == 0; } else if (key->dl_type == htons(ETH_TYPE_IPV6)) { - csum = packet_csum_pseudoheader6(l3); + return packet_csum_upperlayer6(l3, data, key->nw_proto, size) == 0; } else { return false; } - - csum = csum_continue(csum, data, size); - - return csum_finish(csum) == 0; } static inline bool |