summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2011-07-01 21:00:41 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2011-07-01 21:00:41 +0000
commit9203c01cdd082e22f07b85f89ac776698f3e9d60 (patch)
tree1c6fe22a95cb8f792b7b5754ad1a3bc64ca94d7f
parent7994615174a657f32767887c8f7ccd76fee770ef (diff)
The pf_headers union may also contain a mld_hdr or nd_neighbor_solicit
struct. List those types explicitly to make sure that the union contains enough memory. Before we were just lucky. ok henning@
-rw-r--r--sys/net/pf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 7f5cf17f64f..b6fa2989f73 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.751 2011/06/23 19:10:40 claudio Exp $ */
+/* $OpenBSD: pf.c,v 1.752 2011/07/01 21:00:40 bluhm Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -131,6 +131,8 @@ union pf_headers {
struct icmp icmp;
#ifdef INET6
struct icmp6_hdr icmp6;
+ struct mld_hdr mld;
+ struct nd_neighbor_solicit nd_ns;
#endif /* INET6 */
};