[hdf5] 01/02: Fix CVE-2016-4330 CVE-2016-4331 CVE-2016-4332 CVE-2016-4333
Gilles Filippini
pini at debian.org
Sat Nov 26 22:27:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master-1.10
in repository hdf5.
commit df59eb7fa3ea84e0a5bd9f39b2302e808ac3e11d
Author: Gilles Filippini <pini at debian.org>
Date: Fri Nov 25 00:37:12 2016 +0100
Fix CVE-2016-4330 CVE-2016-4331 CVE-2016-4332 CVE-2016-4333
New patches CVE-2016-433*.patch backported from related commits in
upstream develop branch.
---
debian/changelog | 8 ++
debian/patches/CVE-2016-4330.patch | 20 +++
debian/patches/CVE-2016-4331-1.patch | 229 +++++++++++++++++++++++++++++++++++
debian/patches/CVE-2016-4331-2.patch | 19 +++
debian/patches/CVE-2016-4332.patch | 37 ++++++
debian/patches/CVE-2016-4333.patch | 23 ++++
debian/patches/series | 5 +
7 files changed, 341 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index fda1951..d413087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hdf5 (1.10.0-patch1+docs-1~exp5) experimental; urgency=medium
+
+ * New patches CVE-2016-433*.patch from upstream develop branch
+ to fix four vulnerabilities unveiled by TALOS (closes: #845301,
+ CVE-2016-4330, CVE-2016-4331, CVE-2016-4332, CVE-2016-4333)
+
+ -- Gilles Filippini <pini at debian.org> Thu, 24 Nov 2016 23:30:44 +0100
+
hdf5 (1.10.0-patch1+docs-1~exp4) experimental; urgency=medium
* Move setting of substvar ${hdf5-mpi-dev} into dh_makeshlib; it was
diff --git a/debian/patches/CVE-2016-4330.patch b/debian/patches/CVE-2016-4330.patch
new file mode 100644
index 0000000..cbc09b3
--- /dev/null
+++ b/debian/patches/CVE-2016-4330.patch
@@ -0,0 +1,20 @@
+commit b1eb1b3ee8693e2a56b074315b521c66255acca1
+Author: Neil Fortner <nfortne2 at hdfgroup.org>
+Date: Thu Sep 1 17:24:24 2016 -0500
+
+ Replace assertion in H5O_dtype_decode_helper for number of array dimensions with a check and error. The assertion was inappropriate because it is operating on data read from the file, which the library does not always have direct control of.
+
+diff --git a/src/H5Odtype.c b/src/H5Odtype.c
+index e51d319..eae542b 100644
+--- a/src/H5Odtype.c
++++ b/src/H5Odtype.c
+@@ -519,7 +519,8 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
+ dt->shared->u.array.ndims = *(*pp)++;
+
+ /* Double-check the number of dimensions */
+- HDassert(dt->shared->u.array.ndims <= H5S_MAX_RANK);
++ if(dt->shared->u.array.ndims > H5S_MAX_RANK)
++ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "too many dimensions for array datatype")
+
+ /* Skip reserved bytes, if version has them */
+ if(version < H5O_DTYPE_VERSION_3)
diff --git a/debian/patches/CVE-2016-4331-1.patch b/debian/patches/CVE-2016-4331-1.patch
new file mode 100644
index 0000000..078c982
--- /dev/null
+++ b/debian/patches/CVE-2016-4331-1.patch
@@ -0,0 +1,229 @@
+commit 2409f991667283f8fa1dacc66f245950693495aa
+Author: Neil Fortner <nfortne2 at hdfgroup.org>
+Date: Thu Sep 8 10:48:54 2016 -0500
+
+ Fix issues in H5Znbit.c where the decompression algorithm would not check the compressed data for validity, potentially causing a buffer overflow.
+
+Index: hdf5/src/H5Znbit.c
+===================================================================
+--- hdf5.orig/src/H5Znbit.c
++++ hdf5/src/H5Znbit.c
+@@ -60,11 +60,11 @@ static void H5Z_nbit_decompress_one_noop
+ unsigned char *buffer, size_t *j, int *buf_len, unsigned size);
+ static void H5Z_nbit_decompress_one_atomic(unsigned char *data, size_t data_offset,
+ unsigned char *buffer, size_t *j, int *buf_len, parms_atomic p);
+-static void H5Z_nbit_decompress_one_array(unsigned char *data, size_t data_offset,
++static herr_t H5Z__nbit_decompress_one_array(unsigned char *data, size_t data_offset,
+ unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[]);
+-static void H5Z_nbit_decompress_one_compound(unsigned char *data, size_t data_offset,
++static herr_t H5Z__nbit_decompress_one_compound(unsigned char *data, size_t data_offset,
+ unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[]);
+-static void H5Z_nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
++static herr_t H5Z__nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
+ const unsigned parms[]);
+ static void H5Z_nbit_compress_one_nooptype(unsigned char *data, size_t data_offset,
+ unsigned char *buffer, size_t *j, int *buf_len, unsigned size);
+@@ -990,7 +990,8 @@ H5Z_filter_nbit(unsigned flags, size_t c
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for nbit decompression")
+
+ /* decompress the buffer */
+- H5Z_nbit_decompress(outbuf, d_nelmts, (unsigned char *)*buf, cd_values);
++ if(H5Z__nbit_decompress(outbuf, d_nelmts, (unsigned char *)*buf, cd_values) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, 0, "can't decompress buffer")
+ } /* end if */
+ /* output; compress */
+ else {
+@@ -1139,12 +1140,15 @@ H5Z_nbit_decompress_one_atomic(unsigned
+ }
+ }
+
+-static void
+-H5Z_nbit_decompress_one_array(unsigned char *data, size_t data_offset,
++static herr_t
++H5Z__nbit_decompress_one_array(unsigned char *data, size_t data_offset,
+ unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[])
+ {
+ unsigned i, total_size, base_class, base_size, n, begin_index;
+ parms_atomic p;
++ herr_t ret_value = SUCCEED; /* Return value */
++
++ FUNC_ENTER_STATIC
+
+ total_size = parms[parms_index++];
+ base_class = parms[parms_index++];
+@@ -1155,6 +1159,11 @@ H5Z_nbit_decompress_one_array(unsigned c
+ p.order = parms[parms_index++];
+ p.precision = parms[parms_index++];
+ p.offset = parms[parms_index++];
++
++ /* Check values of precision and offset */
++ if(p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
++ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
++
+ n = total_size/p.size;
+ for(i = 0; i < n; i++)
+ H5Z_nbit_decompress_one_atomic(data, data_offset + i*p.size,
+@@ -1165,8 +1174,9 @@ H5Z_nbit_decompress_one_array(unsigned c
+ n = total_size/base_size; /* number of base_type elements inside the array datatype */
+ begin_index = parms_index;
+ for(i = 0; i < n; i++) {
+- H5Z_nbit_decompress_one_array(data, data_offset + i*base_size,
+- buffer, j, buf_len, parms);
++ if(H5Z__nbit_decompress_one_array(data, data_offset + i * base_size,
++ buffer, j, buf_len, parms) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
+ parms_index = begin_index;
+ }
+ break;
+@@ -1175,8 +1185,9 @@ H5Z_nbit_decompress_one_array(unsigned c
+ n = total_size/base_size; /* number of base_type elements inside the array datatype */
+ begin_index = parms_index;
+ for(i = 0; i < n; i++) {
+- H5Z_nbit_decompress_one_compound(data, data_offset + i*base_size,
+- buffer, j, buf_len, parms);
++ if(H5Z__nbit_decompress_one_compound(data, data_offset + i * base_size,
++ buffer, j, buf_len, parms) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
+ parms_index = begin_index;
+ }
+ break;
+@@ -1187,40 +1198,62 @@ H5Z_nbit_decompress_one_array(unsigned c
+ default:
+ HDassert(0 && "This Should never be executed!");
+ } /* end switch */
++
++done:
++ FUNC_LEAVE_NOAPI(ret_value)
+ }
+
+-static void
+-H5Z_nbit_decompress_one_compound(unsigned char *data, size_t data_offset,
++static herr_t
++H5Z__nbit_decompress_one_compound(unsigned char *data, size_t data_offset,
+ unsigned char *buffer, size_t *j, int *buf_len, const unsigned parms[])
+ {
+- unsigned i, nmembers, member_offset, member_class, size;
++ unsigned i, nmembers, member_offset, member_class, member_size, used_size = 0, size;
+ parms_atomic p;
++ herr_t ret_value = SUCCEED; /* Return value */
++
++ FUNC_ENTER_STATIC
+
+- parms_index++; /* skip total size of compound datatype */
++ size = parms[parms_index++];
+ nmembers = parms[parms_index++];
+
+ for(i = 0; i < nmembers; i++) {
+ member_offset = parms[parms_index++];
+ member_class = parms[parms_index++];
++
++ /* Check for overflow */
++ member_size = parms[parms_index];
++ used_size += member_size;
++ if(used_size > size)
++ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "compound member offset overflowed compound size")
+ switch(member_class) {
+ case H5Z_NBIT_ATOMIC:
+- p.size = parms[parms_index++];
++ p.size = member_size;
++ /* Advance past member size */
++ parms_index++;
+ p.order = parms[parms_index++];
+ p.precision = parms[parms_index++];
+ p.offset = parms[parms_index++];
++
++ /* Check values of precision and offset */
++ if(p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
++ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
++
+ H5Z_nbit_decompress_one_atomic(data, data_offset + member_offset,
+ buffer, j, buf_len, p);
+ break;
+ case H5Z_NBIT_ARRAY:
+- H5Z_nbit_decompress_one_array(data, data_offset + member_offset,
+- buffer, j, buf_len, parms);
++ if(H5Z__nbit_decompress_one_array(data, data_offset + member_offset,
++ buffer, j, buf_len, parms) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
+ break;
+ case H5Z_NBIT_COMPOUND:
+- H5Z_nbit_decompress_one_compound(data, data_offset+member_offset,
+- buffer, j, buf_len, parms);
++ if(H5Z__nbit_decompress_one_compound(data, data_offset+member_offset,
++ buffer, j, buf_len, parms) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
+ break;
+ case H5Z_NBIT_NOOPTYPE:
+- size = parms[parms_index++];
++ /* Advance past member size */
++ parms_index++;
+ H5Z_nbit_decompress_one_nooptype(data, data_offset+member_offset,
+ buffer, j, buf_len, size);
+ break;
+@@ -1228,10 +1261,13 @@ H5Z_nbit_decompress_one_compound(unsigne
+ HDassert(0 && "This Should never be executed!");
+ } /* end switch */
+ }
++
++done:
++ FUNC_LEAVE_NOAPI(ret_value)
+ }
+
+-static void
+-H5Z_nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
++static herr_t
++H5Z__nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer,
+ const unsigned parms[])
+ {
+ /* i: index of data, j: index of buffer,
+@@ -1239,6 +1275,9 @@ H5Z_nbit_decompress(unsigned char *data,
+ size_t i, j, size;
+ int buf_len;
+ parms_atomic p;
++ herr_t ret_value = SUCCEED; /* Return value */
++
++ FUNC_ENTER_STATIC
+
+ /* may not have to initialize to zeros */
+ for(i = 0; i < d_nelmts*parms[4]; i++) data[i] = 0;
+@@ -1254,6 +1293,11 @@ H5Z_nbit_decompress(unsigned char *data,
+ p.order = parms[5];
+ p.precision = parms[6];
+ p.offset = parms[7];
++
++ /* Check values of precision and offset */
++ if(p.precision > p.size * 8 || (p.precision + p.offset) > p.size * 8)
++ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "invalid datatype precision/offset")
++
+ for(i = 0; i < d_nelmts; i++) {
+ H5Z_nbit_decompress_one_atomic(data, i*p.size, buffer, &j, &buf_len, p);
+ }
+@@ -1262,7 +1306,8 @@ H5Z_nbit_decompress(unsigned char *data,
+ size = parms[4];
+ parms_index = 4;
+ for(i = 0; i < d_nelmts; i++) {
+- H5Z_nbit_decompress_one_array(data, i*size, buffer, &j, &buf_len, parms);
++ if(H5Z__nbit_decompress_one_array(data, i * size, buffer, &j, &buf_len, parms) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress array")
+ parms_index = 4;
+ }
+ break;
+@@ -1270,13 +1315,17 @@ H5Z_nbit_decompress(unsigned char *data,
+ size = parms[4];
+ parms_index = 4;
+ for(i = 0; i < d_nelmts; i++) {
+- H5Z_nbit_decompress_one_compound(data, i*size, buffer, &j, &buf_len, parms);
++ if(H5Z__nbit_decompress_one_compound(data, i * size, buffer, &j, &buf_len, parms) < 0)
++ HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "can't decompress compound")
+ parms_index = 4;
+ }
+ break;
+ default:
+ HDassert(0 && "This Should never be executed!");
+ } /* end switch */
++
++done:
++ FUNC_LEAVE_NOAPI(ret_value)
+ }
+
+ static void H5Z_nbit_compress_one_byte(unsigned char *data, size_t data_offset, int k, int begin_i,
diff --git a/debian/patches/CVE-2016-4331-2.patch b/debian/patches/CVE-2016-4331-2.patch
new file mode 100644
index 0000000..9381adf
--- /dev/null
+++ b/debian/patches/CVE-2016-4331-2.patch
@@ -0,0 +1,19 @@
+commit 391a231b76c1200ecda5d74636213e9e479fa51a
+Author: Neil Fortner <nfortne2 at hdfgroup.org>
+Date: Fri Sep 9 12:08:30 2016 -0500
+
+ Fix bug in "nooptype" decode in fix for TALOS-0177.
+
+Index: hdf5/src/H5Znbit.c
+===================================================================
+--- hdf5.orig/src/H5Znbit.c
++++ hdf5/src/H5Znbit.c
+@@ -1255,7 +1255,7 @@ H5Z__nbit_decompress_one_compound(unsign
+ /* Advance past member size */
+ parms_index++;
+ H5Z_nbit_decompress_one_nooptype(data, data_offset+member_offset,
+- buffer, j, buf_len, size);
++ buffer, j, buf_len, member_size);
+ break;
+ default:
+ HDassert(0 && "This Should never be executed!");
diff --git a/debian/patches/CVE-2016-4332.patch b/debian/patches/CVE-2016-4332.patch
new file mode 100644
index 0000000..07b4192
--- /dev/null
+++ b/debian/patches/CVE-2016-4332.patch
@@ -0,0 +1,37 @@
+commit bfae878d8f2f65bc5f22f0d4bb314f326278ba7b
+Author: Neil Fortner <nfortne2 at hdfgroup.org>
+Date: Fri Jul 1 10:31:44 2016 -0500
+
+ [svn-r30131] Fix bug reported by Cisco Talos TALOS-CAN-0178. Added check for a message that
+ should not be sharable being marked as sharable on disk, returns failure in
+ this case. Needs testing.
+
+ Tested: ummon
+
+Index: hdf5/src/H5Ocache.c
+===================================================================
+--- hdf5.orig/src/H5Ocache.c
++++ hdf5/src/H5Ocache.c
+@@ -1433,6 +1433,10 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message")
+ if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN))
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination for message")
++ if((flags & H5O_MSG_FLAG_SHAREABLE)
++ && H5O_msg_class_g[id]
++ && !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
++ HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message of unsharable class flagged as sharable")
+
+ /* Reserved bytes/creation index */
+ if(oh->version == H5O_VERSION_1)
+Index: hdf5/src/H5Opkg.h
+===================================================================
+--- hdf5.orig/src/H5Opkg.h
++++ hdf5/src/H5Opkg.h
+@@ -212,6 +212,7 @@
+ \
+ /* Set the message's "shared info", if it's shareable */ \
+ if((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) { \
++ HDassert(msg_type->share_flags & H5O_SHARE_IS_SHARABLE); \
+ H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, H5O_SHARE_TYPE_HERE, (F), msg_type->id, (MSG)->crt_idx, (OH)->chunk[0].addr) \
+ } /* end if */ \
+ \
diff --git a/debian/patches/CVE-2016-4333.patch b/debian/patches/CVE-2016-4333.patch
new file mode 100644
index 0000000..5b0ec5b
--- /dev/null
+++ b/debian/patches/CVE-2016-4333.patch
@@ -0,0 +1,23 @@
+commit bc10fd219e60fc4b9df7d80567ecb1e39ae5b6e3
+Author: Neil Fortner <nfortne2 at hdfgroup.org>
+Date: Thu Sep 8 13:47:22 2016 -0500
+
+ Change check for number of dimensions for old-style arrays in datatype decoding routine from an assertion to an if/HGOTO_ERROR check, since it is inappropriate to assert the contents of a file will be what we expect.
+
+diff --git a/src/H5Odtype.c b/src/H5Odtype.c
+index e51d319..3c3f284 100644
+--- a/src/H5Odtype.c
++++ b/src/H5Odtype.c
+@@ -311,7 +311,11 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
+ if(version == H5O_DTYPE_VERSION_1) {
+ /* Decode the number of dimensions */
+ ndims = *(*pp)++;
+- HDassert(ndims <= 4);
++
++ /* Check that ndims is valid */
++ if(ndims > 4)
++ HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "invalid number of dimensions for array")
++
+ *pp += 3; /*reserved bytes */
+
+ /* Skip dimension permutation */
diff --git a/debian/patches/series b/debian/patches/series
index e0ac21e..ec125b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,8 @@ flavor-configure-option.patch
path_max.diff
ullong_force.diff
relax-version-check.patch
+CVE-2016-4330.patch
+CVE-2016-4331-1.patch
+CVE-2016-4331-2.patch
+CVE-2016-4332.patch
+CVE-2016-4333.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git
More information about the Pkg-grass-devel
mailing list