diff options
| author |   jsg <jsg@openbsd.org> | 2015-07-20 18:42:08 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-07-20 18:42:08 +0000 |
| commit | 443353dace62aea35da06674313ee5bd04fe0fe3 (patch) | |
| tree | c1fc183ea001817fc7c0ba2924b2db57918ea757 | |
| parent | Avoid possible NULL deref in openssl(1) s_server. (diff) | |
| download | wireguard-openbsd-443353dace62aea35da06674313ee5bd04fe0fe3.tar.xz wireguard-openbsd-443353dace62aea35da06674313ee5bd04fe0fe3.zip | |
Add some panics to default paths where code later assumes a non default
path was taken. This both prevents warnings from clang and acts as a
sanity check.
ok mcbride@ henning@
| -rw-r--r-- | sys/net/pf.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_lb.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_table.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 0a739c769bd..1926c77c2f5 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.933 2015/07/20 01:18:33 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.934 2015/07/20 18:42:08 jsg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -2813,6 +2813,8 @@ pf_socket_lookup(struct pf_pdesc *pd) } break; #endif /* INET6 */ + default: + unhandled_af(pd->af); } pd->lookup.uid = inp->inp_socket->so_euid; pd->lookup.gid = inp->inp_socket->so_egid; diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c index 473d0dd974e..4e8d0cd4999 100644 --- a/sys/net/pf_lb.c +++ b/sys/net/pf_lb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_lb.c,v 1.47 2015/07/18 19:19:00 sashan Exp $ */ +/* $OpenBSD: pf_lb.c,v 1.48 2015/07/20 18:42:08 jsg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -872,6 +872,8 @@ pf_postprocess_addr(struct pf_state *cur) rpool = nr->nat; else if (nr->route.addr.type != PF_ADDR_NONE) rpool = nr->route; + else + panic("no appropriate pool"); if (((rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_LEASTSTATES)) return (0); diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c index 335d3c59170..a830fd180fe 100644 --- a/sys/net/pf_table.c +++ b/sys/net/pf_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.112 2015/07/18 19:06:37 sashan Exp $ */ +/* $OpenBSD: pf_table.c,v 1.113 2015/07/20 18:42:08 jsg Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -2171,6 +2171,8 @@ pfr_update_stats(struct pfr_ktable *kt, struct pf_addr *a, struct pf_pdesc *pd, case PF_DROP: op_idx = PFR_OP_BLOCK; break; + default: + panic("unhandled op"); } if ((ke == NULL || (ke->pfrke_flags & PFRKE_FLAG_NOT)) != notrule) { |