Mercurial > hg > graal-jvmci-8
changeset 23515:ecbeafff096f
Merge
author | asaha |
---|---|
date | Fri, 18 Sep 2015 08:41:04 -0700 |
parents | 167d279a864a (current diff) 5d2f21b6c728 (diff) |
children | 65932a133b74 f9f2f9738f5c |
files | .hgtags make/hotspot_version src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp |
diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 18 08:04:52 2015 -0700 +++ b/.hgtags Fri Sep 18 08:41:04 2015 -0700 @@ -723,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
--- a/src/os/linux/vm/perfMemory_linux.cpp Fri Sep 18 08:04:52 2015 -0700 +++ b/src/os/linux/vm/perfMemory_linux.cpp Fri Sep 18 08:41:04 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;
--- a/src/os/solaris/vm/perfMemory_solaris.cpp Fri Sep 18 08:04:52 2015 -0700 +++ b/src/os/solaris/vm/perfMemory_solaris.cpp Fri Sep 18 08:41:04 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;