summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-10-07 11:57:44 +0000
committermpi <mpi@openbsd.org>2015-10-07 11:57:44 +0000
commitf214ddc3ccda3459e1ce08f6b4ec426f7d23cd03 (patch)
tree4dd5978e691813b21aebda7aeb8dcbaf2fb205ac
parentMake rtable_get() private to ensure it won't be used outside of (diff)
downloadwireguard-openbsd-f214ddc3ccda3459e1ce08f6b4ec426f7d23cd03.tar.xz
wireguard-openbsd-f214ddc3ccda3459e1ce08f6b4ec426f7d23cd03.zip
rn_inithead() offset argument is now specified in byte, missed in previous.
-rw-r--r--sys/kern/vfs_subr.c4
-rw-r--r--sys/net/pf_table.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 6157a923ab2..b3542a1c363 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.233 2015/09/04 08:43:39 mpi Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.234 2015/10/07 11:57:44 mpi Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -1378,7 +1378,7 @@ vfs_hang_addrlist(struct mount *mp, struct netexport *nep,
case AF_INET:
if ((rnh = nep->ne_rtable_inet) == NULL) {
if (!rn_inithead((void **)&nep->ne_rtable_inet,
- offsetof(struct sockaddr_in, sin_addr) * 8)) {
+ offsetof(struct sockaddr_in, sin_addr))) {
error = ENOBUFS;
goto out;
}
diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c
index 86907f06fa1..35ea994887e 100644
--- a/sys/net/pf_table.c
+++ b/sys/net/pf_table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_table.c,v 1.114 2015/09/04 08:43:39 mpi Exp $ */
+/* $OpenBSD: pf_table.c,v 1.115 2015/10/07 11:57:44 mpi Exp $ */
/*
* Copyright (c) 2002 Cedric Berger
@@ -2034,9 +2034,9 @@ pfr_create_ktable(struct pfr_table *tbl, time_t tzero, int attachruleset,
}
if (!rn_inithead((void **)&kt->pfrkt_ip4,
- offsetof(struct sockaddr_in, sin_addr) * 8) ||
+ offsetof(struct sockaddr_in, sin_addr)) ||
!rn_inithead((void **)&kt->pfrkt_ip6,
- offsetof(struct sockaddr_in6, sin6_addr) * 8)) {
+ offsetof(struct sockaddr_in6, sin6_addr))) {
pfr_destroy_ktable(kt, 0);
return (NULL);
}