summaryrefslogtreecommitdiff
path: root/sys/netinet6/ip6_var.h
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2019-08-26 18:47:54 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2019-08-26 18:47:54 +0000
commitaa9c5c8561f1b70dc6162fb54dab615be9f93f36 (patch)
treeb2759b55599ec510a09ec418c59494d889852334 /sys/netinet6/ip6_var.h
parent7a534d547f9383b810689125e2b45dc54daed714 (diff)
Do not use the flow of the first fragment to store ECN information.
Handle the ECN in the fragment queue. Reported-by: syzbot+0aa80b25e9041001cac8@syzkaller.appspotmail.com fix from FreeBSD; OK claudio@
Diffstat (limited to 'sys/netinet6/ip6_var.h')
-rw-r--r--sys/netinet6/ip6_var.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 30e45f4bd83..8fb28bb7be0 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_var.h,v 1.84 2018/10/10 11:46:59 reyk Exp $ */
+/* $OpenBSD: ip6_var.h,v 1.85 2019/08/26 18:47:53 bluhm Exp $ */
/* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */
/*
@@ -76,6 +76,7 @@ struct ip6q {
int ip6q_nfrag; /* # of fragments */
u_int32_t ip6q_ident; /* fragment identification */
u_int8_t ip6q_nxt; /* ip6f_nxt in first fragment */
+ u_int8_t ip6q_ecn;
u_int8_t ip6q_ttl; /* time to live in slowtimo units */
};
@@ -85,7 +86,6 @@ struct ip6asfrag {
int ip6af_offset; /* offset in ip6af_m to next header */
int ip6af_frglen; /* fragmentable part length */
int ip6af_off; /* fragment offset */
- u_int32_t ip6af_flow; /* ip header flow id */
u_int16_t ip6af_mff; /* more fragment bit in frag off */
};