summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-08-13 11:26:08 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-08-13 11:26:08 (GMT)
commite291fd31fd480dc4900d056e0e08df002e85a3f2 (patch)
tree76e43a263f18b4300a449ba71faf0fa614bbe71c
parentbaf7ebc4ca4eeecb11a607f420a5d5b95169eed5 (diff)
parentc5cb9534b27760596bfd0c4cdf1db31fd2bac2a7 (diff)
downloadhdf5-e291fd31fd480dc4900d056e0e08df002e85a3f2.zip
hdf5-e291fd31fd480dc4900d056e0e08df002e85a3f2.tar.gz
hdf5-e291fd31fd480dc4900d056e0e08df002e85a3f2.tar.bz2
Merge pull request #2756 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c5cb9534b27760596bfd0c4cdf1db31fd2bac2a7': spelling HDFFV-11127 - force RTLD_LOCAL in dlopen
-rw-r--r--release_docs/RELEASE.txt15
-rw-r--r--src/H5PLpkg.h2
2 files changed, 13 insertions, 4 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 7ccdbe9..07c61e5 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -349,9 +349,9 @@ New Features
added to the libhdf5.settings file.
Autotools:
-
+
An --enable-file-locking=(yes|no|best-effort) option has been added.
-
+
yes: Use file locking.
no: Do not use file locking.
best-effort: Use file locking and ignore "disabled" errors.
@@ -765,6 +765,15 @@ Bug Fixes since HDF5-1.10.3 release
Library
-------
+ - Explicitly declared dlopen to use RTLD_LOCAL
+
+ dlopen documentation states that if neither RTLD_GLOBAL nor
+ RTLD_LOCAL are specified, then the default behavior is unspecified.
+ The default on linux is usually RTLD_LOCAL while macos will default
+ to RTLD_GLOBAL.
+
+ (ADB - 2020/08/12, HDFFV-11127)
+
- Fixed issues CVE-2018-13870 and CVE-2018-13869
When a buffer overflow occurred because a name length was corrupted
@@ -774,7 +783,7 @@ Bug Fixes since HDF5-1.10.3 release
locations to prevent the crashes and h5dump now simply fails with an
error message when this error condition occurs.
- (BMR - 2020/7/22, HDFFV-11120 and HDFFV-11121)
+ (BMR - 2020/07/22, HDFFV-11120 and HDFFV-11121)
- Fixed the segmentation fault when reading attributes with multiple threads
diff --git a/src/H5PLpkg.h b/src/H5PLpkg.h
index 8c2367f..a086a2c 100644
--- a/src/H5PLpkg.h
+++ b/src/H5PLpkg.h
@@ -95,7 +95,7 @@
# define H5PL_HANDLE void *
/* Get a handle to a plugin library. Windows: TEXT macro handles Unicode strings */
-# define H5PL_OPEN_DLIB(S) dlopen(S, RTLD_LAZY)
+# define H5PL_OPEN_DLIB(S) dlopen(S, RTLD_LAZY | RTLD_LOCAL)
/* Get the address of a symbol in dynamic library */
# define H5PL_GET_LIB_FUNC(H,N) dlsym(H,N)