Merge

Mon, 21 Sep 2015 23:22:45 -0700

author
asaha
date
Mon, 21 Sep 2015 23:22:45 -0700
changeset 8228
f9f2f9738f5c
parent 8154
3d13e757229c
parent 8226
ecbeafff096f
child 8229
67df26e363fb
child 8231
0ff90c97d892

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Sep 21 21:48:47 2015 -0700
     1.2 +++ b/.hgtags	Mon Sep 21 23:22:45 2015 -0700
     1.3 @@ -566,6 +566,7 @@
     1.4  b517d3a9aebf0fee64808f9a7c0ef8e0b82d5ed3 jdk8u31-b31
     1.5  15d8108258cb60a58bdd03b9ff8e77dd6727a804 jdk8u31-b32
     1.6  26b1dc6891c4fae03575a9090f7d04bd631d9164 jdk8u31-b33
     1.7 +70e73f8f43fc71c0629253e22121c974bfd79b86 jdk8u31-b34
     1.8  1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
     1.9  f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
    1.10  99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
    1.11 @@ -667,6 +668,8 @@
    1.12  9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15
    1.13  3639e38bd73f5efa8ce092f0a745bb0c90759575 jdk8u51-b16
    1.14  20bad8c6c7b406c3603b4e22b15cd990840a9d62 jdk8u51-b31
    1.15 +e51afd2a1fc17de59ff3c79003210a40a28ac960 jdk8u51-b32
    1.16 +b2427357cc98aeb2716ee2e89e733794afb4057b jdk8u51-b33
    1.17  d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00
    1.18  d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00
    1.19  ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01
    1.20 @@ -720,6 +723,8 @@
    1.21  6b4ea38c01bd9cc86d0aa8926f4855ff6ee365ee jdk8u60-b25
    1.22  6a6759372807f49aa7a66ddc36aa91d6648d2097 jdk8u60-b26
    1.23  10ad4b9d79f98fa3545c88a342a68a80d198b808 jdk8u60-b27
    1.24 +1f646daf0d673b0925da1ed7809d6bd097388ece jdk8u60-b31
    1.25 +9bf9a733246b5e89986233f42a8e00c798ca703f jdk8u60-b32
    1.26  0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
    1.27  9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
    1.28  0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
     2.1 --- a/src/os/linux/vm/perfMemory_linux.cpp	Mon Sep 21 21:48:47 2015 -0700
     2.2 +++ b/src/os/linux/vm/perfMemory_linux.cpp	Mon Sep 21 23:22:45 2015 -0700
     2.3 @@ -217,9 +217,9 @@
     2.4      //
     2.5      return false;
     2.6    }
     2.7 -  // See if the uid of the directory matches the effective uid of the process.
     2.8 -  //
     2.9 -  if (statp->st_uid != geteuid()) {
    2.10 +  // If user is not root then see if the uid of the directory matches the effective uid of the process.
    2.11 +  uid_t euid = geteuid();
    2.12 +  if ((euid != 0) && (statp->st_uid != euid)) {
    2.13      // The directory was not created by this user, declare it insecure.
    2.14      //
    2.15      return false;
     3.1 --- a/src/os/solaris/vm/perfMemory_solaris.cpp	Mon Sep 21 21:48:47 2015 -0700
     3.2 +++ b/src/os/solaris/vm/perfMemory_solaris.cpp	Mon Sep 21 23:22:45 2015 -0700
     3.3 @@ -219,9 +219,9 @@
     3.4      //
     3.5      return false;
     3.6    }
     3.7 -  // See if the uid of the directory matches the effective uid of the process.
     3.8 -  //
     3.9 -  if (statp->st_uid != geteuid()) {
    3.10 +  // If user is not root then see if the uid of the directory matches the effective uid of the process.
    3.11 +  uid_t euid = geteuid();
    3.12 +  if ((euid != 0) && (statp->st_uid != euid)) {
    3.13      // The directory was not created by this user, declare it insecure.
    3.14      //
    3.15      return false;

mercurial