From owner-svn-src-user@FreeBSD.ORG  Sat Feb 22 23:32:34 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 157B69CA;
 Sat, 22 Feb 2014 23:32:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 000F21874;
 Sat, 22 Feb 2014 23:32:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1MNWXOW006957;
 Sat, 22 Feb 2014 23:32:33 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1MNWXC2006956;
 Sat, 22 Feb 2014 23:32:33 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201402222332.s1MNWXC2006956@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sat, 22 Feb 2014 23:32:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r262348 - user/ae/inet6/sys/kern
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Feb 2014 23:32:34 -0000

Author: ae
Date: Sat Feb 22 23:32:33 2014
New Revision: 262348
URL: http://svnweb.freebsd.org/changeset/base/262348

Log:
  We can't use the mask here, because the sizeof(struct sockaddr_in6)
  isn't a power of two.

Modified:
  user/ae/inet6/sys/kern/kern_jail.c

Modified: user/ae/inet6/sys/kern/kern_jail.c
==============================================================================
--- user/ae/inet6/sys/kern/kern_jail.c	Sat Feb 22 22:18:20 2014	(r262347)
+++ user/ae/inet6/sys/kern/kern_jail.c	Sat Feb 22 23:32:33 2014	(r262348)
@@ -874,7 +874,7 @@ kern_jail_set(struct thread *td, struct 
 		ip6s = (pr_flags & PR_IP6_DISABLE) ? 0 : -1;
 	else if (error != 0)
 		goto done_free;
-	else if (ip6s & (sizeof(*ip6) - 1)) {
+	else if (ip6s % sizeof(*ip6)) {
 		error = EINVAL;
 		goto done_free;
 	} else {