# HG changeset patch
# User asaha
# Date 1444848846 25200
# Node ID 88241bfbe97ff2d429599e8fcb3248d5d41feabc
# Parent  9ae2a5adabba97d9ebf79e13b325f1ff368ce014# Parent  0ff90c97d892396090fa0a03a72228b9b1860e73
Merge

diff -r 9ae2a5adabba -r 88241bfbe97f .hgtags
--- a/.hgtags	Tue Oct 06 12:18:03 2015 -0700
+++ b/.hgtags	Wed Oct 14 11:54:06 2015 -0700
@@ -566,6 +566,7 @@
 b517d3a9aebf0fee64808f9a7c0ef8e0b82d5ed3 jdk8u31-b31
 15d8108258cb60a58bdd03b9ff8e77dd6727a804 jdk8u31-b32
 26b1dc6891c4fae03575a9090f7d04bd631d9164 jdk8u31-b33
+70e73f8f43fc71c0629253e22121c974bfd79b86 jdk8u31-b34
 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
@@ -667,6 +668,8 @@
 9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15
 3639e38bd73f5efa8ce092f0a745bb0c90759575 jdk8u51-b16
 20bad8c6c7b406c3603b4e22b15cd990840a9d62 jdk8u51-b31
+e51afd2a1fc17de59ff3c79003210a40a28ac960 jdk8u51-b32
+b2427357cc98aeb2716ee2e89e733794afb4057b jdk8u51-b33
 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00
 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00
 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01
@@ -720,6 +723,8 @@
 6b4ea38c01bd9cc86d0aa8926f4855ff6ee365ee jdk8u60-b25
 6a6759372807f49aa7a66ddc36aa91d6648d2097 jdk8u60-b26
 10ad4b9d79f98fa3545c88a342a68a80d198b808 jdk8u60-b27
+1f646daf0d673b0925da1ed7809d6bd097388ece jdk8u60-b31
+9bf9a733246b5e89986233f42a8e00c798ca703f jdk8u60-b32
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
 9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
diff -r 9ae2a5adabba -r 88241bfbe97f make/hotspot_version
diff -r 9ae2a5adabba -r 88241bfbe97f src/os/linux/vm/perfMemory_linux.cpp
--- a/src/os/linux/vm/perfMemory_linux.cpp	Tue Oct 06 12:18:03 2015 -0700
+++ b/src/os/linux/vm/perfMemory_linux.cpp	Wed Oct 14 11:54:06 2015 -0700
@@ -217,9 +217,9 @@
     //
     return false;
   }
-  // See if the uid of the directory matches the effective uid of the process.
-  //
-  if (statp->st_uid != geteuid()) {
+  // If user is not root then see if the uid of the directory matches the effective uid of the process.
+  uid_t euid = geteuid();
+  if ((euid != 0) && (statp->st_uid != euid)) {
     // The directory was not created by this user, declare it insecure.
     //
     return false;
diff -r 9ae2a5adabba -r 88241bfbe97f src/os/solaris/vm/perfMemory_solaris.cpp
--- a/src/os/solaris/vm/perfMemory_solaris.cpp	Tue Oct 06 12:18:03 2015 -0700
+++ b/src/os/solaris/vm/perfMemory_solaris.cpp	Wed Oct 14 11:54:06 2015 -0700
@@ -219,9 +219,9 @@
     //
     return false;
   }
-  // See if the uid of the directory matches the effective uid of the process.
-  //
-  if (statp->st_uid != geteuid()) {
+  // If user is not root then see if the uid of the directory matches the effective uid of the process.
+  uid_t euid = geteuid();
+  if ((euid != 0) && (statp->st_uid != euid)) {
     // The directory was not created by this user, declare it insecure.
     //
     return false;
diff -r 9ae2a5adabba -r 88241bfbe97f src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp