diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
| commit | b4a027550acf2c1051c34f997b8e7e845017af4b (patch) | |
| tree | 9e38d3c17b42cb1e6765620a87e908973a93c821 /yocto-poky/meta/recipes-multimedia/libsndfile | |
| parent | 2fe86d90044af218ced8f42fdded6b136f1046d2 (diff) | |
| parent | f1e5d6968976c2341c6d554bfcc8895f1b33c26b (diff) | |
| download | talos-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.tar.gz talos-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.zip | |
Merge commit 'f1e5d6968976c2341c6d554bfcc8895f1b33c26b' from yocto-2.0.1
Diffstat (limited to 'yocto-poky/meta/recipes-multimedia/libsndfile')
| -rw-r--r-- | yocto-poky/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch | 24 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch b/yocto-poky/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch new file mode 100644 index 000000000..b54b3ba66 --- /dev/null +++ b/yocto-poky/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch @@ -0,0 +1,24 @@ +src/file_io.c : Prevent potential divide-by-zero. + +Closes: https://github.com/erikd/libsndfile/issues/92 + +Upstream-Status: Backport + +Fixes CVE-2014-9756 + +Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- +diff -Naur libsndfile-1.0.25-orig/src/file_io.c libsndfile-1.0.25/src/file_io.c +--- libsndfile-1.0.25-orig/src/file_io.c 2011-01-19 12:12:28.000000000 +0200 ++++ libsndfile-1.0.25/src/file_io.c 2015-11-04 15:02:04.337395618 +0200 +@@ -358,6 +358,9 @@ + { sf_count_t total = 0 ; + ssize_t count ; + ++ if (bytes == 0 || items == 0) ++ return 0 ; ++ + if (psf->virtual_io) + return psf->vio.write (ptr, bytes*items, psf->vio_user_data) / bytes ; + diff --git a/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb b/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb index 3e02f4ea7..be875c227 100644 --- a/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb +++ b/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb @@ -9,6 +9,7 @@ PR = "r2" SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \ file://0001-src-sd2.c-Fix-segfault-in-SD2-RSRC-parser.patch \ file://0001-src-sd2.c-Fix-two-potential-buffer-read-overflows.patch \ + file://libsndfile-fix-CVE-2014-9756.patch \ " SRC_URI[md5sum] = "e2b7bb637e01022c7d20f95f9c3990a2" |
