svn commit: r258929 - in stable/10/sys: compat/freebsd32 kern

[Peter Wemm]

Author: peter
Date: Wed Dec  4 18:25:04 2013
New Revision: 258929
URL: http://svnweb.freebsd.org/changeset/base/258929

Log:
  MFC: r258718: fix emulated jail_v0 byte order
  
  Approved by:	re (gjb)

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

Modified: stable/10/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/10/sys/compat/freebsd32/freebsd32_misc.c	Wed Dec  4 16:38:40 2013	(r258928)
+++ stable/10/sys/compat/freebsd32/freebsd32_misc.c	Wed Dec  4 18:25:04 2013	(r258929)
@@ -1925,7 +1925,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/10/sys/kern/kern_jail.c
==============================================================================
--- stable/10/sys/kern/kern_jail.c	Wed Dec  4 16:38:40 2013	(r258928)
+++ stable/10/sys/kern/kern_jail.c	Wed Dec  4 18:25:04 2013	(r258929)
@@ -313,7 +313,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;
 	}