diff options
| author |   claudio <claudio@openbsd.org> | 2018-12-07 08:40:54 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2018-12-07 08:40:54 +0000 |
| commit | 884600cab55ab723767cbaa3063f4b1b2fcc7dce (patch) | |
| tree | 13e32c8d311ef550115423786f59d41749cab4fe /usr.sbin/ldpd | |
| parent | All the references to the M_ALIGN and MH_ALIGN macros are gone. (diff) | |
| download | wireguard-openbsd-884600cab55ab723767cbaa3063f4b1b2fcc7dce.tar.xz wireguard-openbsd-884600cab55ab723767cbaa3063f4b1b2fcc7dce.zip | |
Be more strict in converting a netmask into a prefixlen. Make sure
the prefixlen is never bigger than 128 for inet6.
OK remi@
Diffstat (limited to 'usr.sbin/ldpd')
| -rw-r--r-- | usr.sbin/ldpd/util.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/usr.sbin/ldpd/util.c b/usr.sbin/ldpd/util.c index ba0cfa0a2f4..148e09a5927 100644 --- a/usr.sbin/ldpd/util.c +++ b/usr.sbin/ldpd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.4 2016/05/23 18:58:48 renato Exp $ */ +/* $OpenBSD: util.c,v 1.5 2018/12/07 08:40:54 claudio Exp $ */ /* * Copyright (c) 2015 Renato Westphal <renato@openbsd.org> @@ -37,7 +37,8 @@ mask2prefixlen(in_addr_t ina) uint8_t mask2prefixlen6(struct sockaddr_in6 *sa_in6) { - uint8_t l = 0, *ap, *ep; + unsigned int l = 0; + uint8_t *ap, *ep; /* * sin6_len is the size of the sockaddr so substract the offset of @@ -53,32 +54,35 @@ mask2prefixlen6(struct sockaddr_in6 *sa_in6) break; case 0xfe: l += 7; - return (l); + goto done; case 0xfc: l += 6; - return (l); + goto done; case 0xf8: l += 5; - return (l); + goto done; case 0xf0: l += 4; - return (l); + goto done; case 0xe0: l += 3; - return (l); + goto done; case 0xc0: l += 2; - return (l); + goto done; case 0x80: l += 1; - return (l); + goto done; case 0x00: - return (l); + goto done; default: fatalx("non contiguous inet6 netmask"); } } +done: + if (l > sizeof(struct in6_addr) * 8) + fatalx("inet6 prefixlen out of bound"); return (l); } |