diff options
| author |   millert <millert@openbsd.org> | 1998-08-05 19:51:06 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1998-08-05 19:51:06 +0000 |
| commit | 9dc386cf6d1ed6987891951748011a77fa978e41 (patch) | |
| tree | 54cc655903c0e7013f937060390a7590837b603a | |
| parent | IOV_MAX, not UIO_MAXIOV (diff) | |
| download | wireguard-openbsd-9dc386cf6d1ed6987891951748011a77fa978e41.tar.xz wireguard-openbsd-9dc386cf6d1ed6987891951748011a77fa978e41.zip | |
fix ifc_len == 0 hack for variable size structures.
| -rw-r--r-- | sys/net/if.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 6519d86152f..005918ce919 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.17 1998/08/04 20:57:19 millert Exp $ */ +/* $OpenBSD: if.c,v 1.18 1998/08/05 19:51:06 millert Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -590,8 +590,23 @@ ifconf(cmd, data) /* If ifc->ifc_len is 0, fill it in with the needed size and return. */ if (space == 0) { - for (ifp = ifnet.tqh_first; ifp; ifp = ifp->if_list.tqe_next) - space += sizeof (ifr); + for (ifp = ifnet.tqh_first; ifp; ifp = ifp->if_list.tqe_next) { + register struct sockaddr *sa; + + if ((ifa = ifp->if_addrlist.tqh_first) == 0) + space += sizeof (ifr); + else + for (; ifa != 0; ifa = ifa->ifa_list.tqe_next) { + sa = ifa->ifa_addr; +#if defined(COMPAT_43) || defined(COMPAT_LINUX) || defined(COMPAT_SVR4) + if (cmd != OSIOCGIFCONF) +#endif + if (sa->sa_len > sizeof(*sa)) + space += sa->sa_len - + sizeof (*sa); + space += sizeof (ifr); + } + } ifc->ifc_len = space; return(0); } |