Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2013 23:06:52 +0000 (UTC)
From:      Peter Wemm <peter@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r258783 - in stable/8/sys: compat/freebsd32 kern
Message-ID:  <201311302306.rAUN6qbs054363@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: peter
Date: Sat Nov 30 23:06:51 2013
New Revision: 258783
URL: http://svnweb.freebsd.org/changeset/base/258783

Log:
  MFC: r258718: fix emulated jail_v0 byte order

Modified:
  stable/8/sys/compat/freebsd32/freebsd32_misc.c
  stable/8/sys/kern/kern_jail.c

Modified: stable/8/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/8/sys/compat/freebsd32/freebsd32_misc.c	Sat Nov 30 22:49:26 2013	(r258782)
+++ stable/8/sys/compat/freebsd32/freebsd32_misc.c	Sat Nov 30 23:06:51 2013	(r258783)
@@ -1773,7 +1773,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/8/sys/kern/kern_jail.c
==============================================================================
--- stable/8/sys/kern/kern_jail.c	Sat Nov 30 22:49:26 2013	(r258782)
+++ stable/8/sys/kern/kern_jail.c	Sat Nov 30 23:06:51 2013	(r258783)
@@ -291,7 +291,7 @@ jail(struct thread *td, struct jail_args
 		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;
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311302306.rAUN6qbs054363>