Mercurial > hg > graal-jvmci-8
changeset 23516:65932a133b74
Merge
| author | asaha |
|---|---|
| date | Sun, 20 Sep 2015 22:55:06 -0700 |
| parents | 4fa5562faaf6 (current diff) ecbeafff096f (diff) |
| children | 67df26e363fb |
| files | .hgtags make/hotspot_version |
| diffstat | 3 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 31 14:41:35 2015 -0700 +++ b/.hgtags Sun Sep 20 22:55: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 @@ -735,6 +740,8 @@ 0274b03fdf4a3e4d125547d68ed74b4f55d515ec jdk8u65-b10 a106723ba50719c479614d1f599e951edb51506c jdk8u65-b11 a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12 +529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13 +ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02 @@ -746,4 +753,6 @@ 5280a8174aea13bd242480419e6228857dac7b59 jdk8u66-b10 8a23b6392c590b7bf5f6ad2c4746dc03981a7f60 jdk8u66-b11 ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12 +4d699853544cf869d4edaf23b7cc9cfbb2900a2b jdk8u66-b13 +9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14 9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
--- a/src/os/linux/vm/perfMemory_linux.cpp Mon Aug 31 14:41:35 2015 -0700 +++ b/src/os/linux/vm/perfMemory_linux.cpp Sun Sep 20 22:55: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;
--- a/src/os/solaris/vm/perfMemory_solaris.cpp Mon Aug 31 14:41:35 2015 -0700 +++ b/src/os/solaris/vm/perfMemory_solaris.cpp Sun Sep 20 22:55: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;