From owner-svn-src-stable-9@FreeBSD.ORG Sat Nov 30 23:08:32 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF49FFE9; Sat, 30 Nov 2013 23:08:32 +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 BAE231008; Sat, 30 Nov 2013 23:08:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAUN8Wkk054669; Sat, 30 Nov 2013 23:08:32 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAUN8Wd0054667; Sat, 30 Nov 2013 23:08:32 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201311302308.rAUN8Wd0054667@svn.freebsd.org> From: Peter Wemm Date: Sat, 30 Nov 2013 23:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258784 - in stable/9/sys: compat/freebsd32 kern X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Nov 2013 23:08:32 -0000 Author: peter Date: Sat Nov 30 23:08:32 2013 New Revision: 258784 URL: http://svnweb.freebsd.org/changeset/base/258784 Log: MFC: r258718: fix emulated jail_v0 byte order Modified: stable/9/sys/compat/freebsd32/freebsd32_misc.c stable/9/sys/kern/kern_jail.c Modified: stable/9/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/9/sys/compat/freebsd32/freebsd32_misc.c Sat Nov 30 23:06:51 2013 (r258783) +++ stable/9/sys/compat/freebsd32/freebsd32_misc.c Sat Nov 30 23:08:32 2013 (r258784) @@ -1913,7 +1913,7 @@ freebsd32_jail(struct thread *td, struct CP(j32_v0, j, version); PTRIN_CP(j32_v0, j, path); PTRIN_CP(j32_v0, j, hostname); - j.ip4s = j32_v0.ip_number; + j.ip4s = htonl(j32_v0.ip_number); /* jail_v0 is host order */ break; } Modified: stable/9/sys/kern/kern_jail.c ============================================================================== --- stable/9/sys/kern/kern_jail.c Sat Nov 30 23:06:51 2013 (r258783) +++ stable/9/sys/kern/kern_jail.c Sat Nov 30 23:08:32 2013 (r258784) @@ -311,7 +311,7 @@ sys_jail(struct thread *td, struct jail_ j.version = j0.version; j.path = j0.path; j.hostname = j0.hostname; - j.ip4s = j0.ip_number; + j.ip4s = htonl(j0.ip_number); /* jail_v0 is host order */ break; }