comparison src/os/linux/vm/perfMemory_linux.cpp @ 23455:9f8038f83a6e

8130910: hsperfdata file is created in wrong directory and not cleaned up if /tmp/hsperfdata_<username> has wrong permissions Summary: Add check for fchir() failure and disable shared PerfMemory in that case. Reviewed-by: dcubed, simonis, gthornbr
author clanger
date Tue, 17 Nov 2015 09:39:45 -0800
parents decf7079a7b9
children b5f3a471e646
comparison
equal deleted inserted replaced
23454:714096aec397 23455:9f8038f83a6e
1 /* 1 /*
2 * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
372 *saved_cwd_fd = -1; 372 *saved_cwd_fd = -1;
373 } else { 373 } else {
374 *saved_cwd_fd = result; 374 *saved_cwd_fd = result;
375 } 375 }
376 376
377 // Set the current directory to dirname by using the fd of the directory. 377 // Set the current directory to dirname by using the fd of the directory and
378 // handle errors, otherwise shared memory files will be created in cwd.
378 result = fchdir(fd); 379 result = fchdir(fd);
379 380 if (result == OS_ERR) {
380 return dirp; 381 if (PrintMiscellaneous && Verbose) {
382 warning("could not change to directory %s", dirname);
383 }
384 if (*saved_cwd_fd != -1) {
385 ::close(*saved_cwd_fd);
386 *saved_cwd_fd = -1;
387 }
388 // Close the directory.
389 os::closedir(dirp);
390 return NULL;
391 } else {
392 return dirp;
393 }
381 } 394 }
382 395
383 // Close the directory and restore the current working directory. 396 // Close the directory and restore the current working directory.
384 // 397 //
385 static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) { 398 static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) {