Fix CIDR parsing bug in mountd ACLs.

Approved by: so (cperciva) Security: FreeBSD-SA-11:01.mountd
freebsd · Apr 20, 2011 · 49dd346 · 49dd346
1 parent 079d10e
commit 49dd346
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/UPDATING b/UPDATING
@@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V:
 	debugging tools present in HEAD were left in place because
 	sun4v support still needs work to become production ready.
 
+20110420:	p3	FreeBSD-SA-11:01.mountd
+	Fix CIDR parsing bug in mountd ACLs.
+
 20101129:	p2	FreeBSD-SA-10:10.openssl
 	Fix OpenSSL multiple vulnerabilities.
 

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="8.1"
-BRANCH="RELEASE-p2"
+BRANCH="RELEASE-p3"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
@@ -2937,7 +2937,7 @@ makemask(struct sockaddr_storage *ssp, int bitlen)
 
 	for (i = 0; i < len; i++) {
 		bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
-		*p++ = (1 << bits) - 1;
+		*p++ = (u_char)~0 << (CHAR_BIT - bits);
 		bitlen -= bits;
 	}
 	return 0;