[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7282/8267] libsndfile1: Fix CVE-2017-8362

[Emmanuele Bassi <ebassi src gnome org>]

commit 0bead4042320351d39f81b8cf7281e91c777aa7d
Author: Jackie Huang <jackie huang windriver com>
Date:   Thu Aug 17 14:44:28 2017 +0800

    libsndfile1: Fix CVE-2017-8362
    
    Backport the patch to fix CVE-2017-8362:
    
    The flac_buffer_copy function in flac.c in libsndfile 1.0.28 allows
    remote attackers to cause a denial of service (invalid read and
    application crash) via a crafted audio file.
    
    Reference:
    https://nvd.nist.gov/vuln/detail/CVE-2017-8362
    
    (From OE-Core rev: 0c8da3f6f85962196f2ad54fffd839239f5c2274)
    
    Signed-off-by: Jackie Huang <jackie huang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../libsndfile/libsndfile1/CVE-2017-8362.patch     |   59 ++++++++++++++++++++
 .../libsndfile/libsndfile1_1.0.28.bb               |    1 +
 2 files changed, 60 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch 
b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch
new file mode 100644
index 0000000..9ee7e46
--- /dev/null
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch
@@ -0,0 +1,59 @@
+From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd mega-nerd com>
+Date: Fri, 14 Apr 2017 15:19:16 +1000
+Subject: [PATCH] src/flac.c: Fix a buffer read overflow
+
+A file (generated by a fuzzer) which increased the number of channels
+from one frame to the next could cause a read beyond the end of the
+buffer provided by libFLAC. Only option is to abort the read.
+
+Closes: https://github.com/erikd/libsndfile/issues/231
+
+CVE: CVE-2017-8362
+
+Upstream-Status: Backport 
[https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808]
+
+Signed-off-by: Jackie Huang <jackie huang windriver com>
+---
+ src/flac.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/flac.c b/src/flac.c
+index 5a4f8c2..e4f9aaa 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf)
+       const int32_t* const *buffer = pflac->wbuffer ;
+       unsigned i = 0, j, offset, channels, len ;
+ 
++      if (psf->sf.channels != (int) frame->header.channels)
++      {       psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n"
++                                                                      "Nothing to do but to error out.\n" ,
++                                                                      psf->sf.channels, 
frame->header.channels) ;
++              psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
++              return 0 ;
++              } ;
++
+       /*
+       **      frame->header.blocksize is variable and we're using a constant blocksize
+       **      of FLAC__MAX_BLOCK_SIZE.
+@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf)
+               return 0 ;
+               } ;
+ 
+-
+       len = SF_MIN (pflac->len, frame->header.blocksize) ;
+ 
+       if (pflac->remain % channels != 0)
+@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
+       {       case FLAC__METADATA_TYPE_STREAMINFO :
+                       if (psf->sf.channels > 0 && psf->sf.channels != (int) 
metadata->data.stream_info.channels)
+                       {       psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
+-                                                                      "Nothing to be but to error out.\n" ,
++                                                                      "Nothing to do but to error out.\n" ,
+                                                                       psf->sf.channels, 
metadata->data.stream_info.channels) ;
+                               psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
+                               return ;
+-- 
+2.7.4
+
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb 
b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
index f80ce2f..2bd51b1 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
@@ -8,6 +8,7 @@ LICENSE = "LGPLv2.1"
 SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \
            file://CVE-2017-6892.patch \
            file://CVE-2017-8361-8365.patch \
+           file://CVE-2017-8362.patch \
           "
 
 SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c"