mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

isc_sockaddr_eqaddrprefix() checked prefix length against wrong value

Browse Source
This commit is contained in:
Andreas Gustafsson
1999-11-30 22:03:16 +00:00
parent afaaf4c0aa
commit 37eebcb917
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/isc/sockaddr.c
View File

@@ -107,7 +107,9 @@ isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b,
unsigned int prefixlen) unsigned int prefixlen)
{ {
unsigned char *pa, *pb; unsigned char *pa, *pb;
unsigned int nbytes, nbits; unsigned int ipabytes; /* Length of whole IP address in bytes */
unsigned int nbytes; /* Number of significant whole bytes */
unsigned int nbits; /* Number of significant leftover bits */
REQUIRE(a != NULL && b != NULL); REQUIRE(a != NULL && b != NULL);
@@ -121,19 +123,22 @@ isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b,
case AF_INET: case AF_INET:
pa = (unsigned char *) &a->type.sin.sin_addr; pa = (unsigned char *) &a->type.sin.sin_addr;
pb = (unsigned char *) &b->type.sin.sin_addr; pb = (unsigned char *) &b->type.sin.sin_addr;
ipabytes = 4;
break; break;
case AF_INET6: case AF_INET6:
pa = ((unsigned char *) &a->type.sin6.sin6_addr); pa = ((unsigned char *) &a->type.sin6.sin6_addr);
pb = ((unsigned char *) &b->type.sin6.sin6_addr); pb = ((unsigned char *) &b->type.sin6.sin6_addr);
ipabytes = 16;
break; break;
default: default:
pa = pb = NULL; /* Avoid silly compiler warning. */ pa = pb = NULL; /* Avoid silly compiler warning. */
ipabytes = 0; /* Ditto. */
return (ISC_FALSE); /* XXX got a better idea? */ return (ISC_FALSE); /* XXX got a better idea? */
} }
/* Don't crash if we get a pattern like 10.0.0.1/9999999. */ /* Don't crash if we get a pattern like 10.0.0.1/9999999. */
if (prefixlen > a->length * 8) if (prefixlen > ipabytes * 8)
prefixlen = a->length * 8; prefixlen = ipabytes * 8;
nbytes = prefixlen / 8; nbytes = prefixlen / 8;
nbits = prefixlen % 8; nbits = prefixlen % 8;
@@ -144,7 +149,7 @@ isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b,
} }
if (nbits > 0) { if (nbits > 0) {
unsigned int bytea, byteb, mask; unsigned int bytea, byteb, mask;
INSIST(nbytes < a->length); INSIST(nbytes < ipabytes);
INSIST(nbits < 8); INSIST(nbits < 8);
bytea = pa[nbytes]; bytea = pa[nbytes];
byteb = pb[nbytes]; byteb = pb[nbytes];