Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=9331cb6228aaabc233b673288a285523f5cb70db
commit 9331cb6228aaabc233b673288a285523f5cb70db Author: kikadf <[email protected]> Date: Mon Mar 2 11:24:37 2015 +0100 cups-1.6.1-13-x86_64 * Fix CVe-2014-9679 diff --git a/source/xapps/cups/CVE-2014-9679.patch b/source/xapps/cups/CVE-2014-9679.patch new file mode 100644 index 0000000..e25f79c --- /dev/null +++ b/source/xapps/cups/CVE-2014-9679.patch @@ -0,0 +1,40 @@ +Description: Fix cupsRasterReadPixels buffer overflow with invalid page header + and compressed raster data +Author: Michael Sweet <[email protected]> +Bug-Debian: https://bugs.debian.org/778387 +Bug-Upstream: https://www.cups.org/str.php?L4551 +Bug-CVE: CVE-2014-2679 +Last-Update: 2015-02-16 +--- a/filter/raster.c ++++ b/filter/raster.c +@@ -284,7 +284,10 @@ + */ + + if (!cups_raster_read_header(r)) ++ { ++ memset(h, 0, sizeof(cups_page_header_t)); + return (0); ++ } + + /* + * Copy the header to the user-supplied buffer... +@@ -313,7 +316,10 @@ + */ + + if (!cups_raster_read_header(r)) ++ { ++ memset(h, 0, sizeof(cups_page_header2_t)); + return (0); ++ } + + /* + * Copy the header to the user-supplied buffer... +@@ -991,7 +997,7 @@ + + cups_raster_update(r); + +- return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0); ++ return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0); + } + + diff --git a/source/xapps/cups/FrugalBuild b/source/xapps/cups/FrugalBuild index 9267179..637411d 100644 --- a/source/xapps/cups/FrugalBuild +++ b/source/xapps/cups/FrugalBuild @@ -6,7 +6,7 @@ options+=('asneeded') pkgname=cups pkgver=1.6.1 -pkgrel=12 +pkgrel=13 pkgdesc="The CUPS Printing System" url="http://www.cups.org/"; depends=('libtiff' 'libpng>=1.4.1' 'libjpeg>=8a' 'systemd' 'poppler-pdftools>=0.18.0' 'xdg-utils') @@ -36,11 +36,12 @@ subarchs=('i686 x86_64 arm') # FSA fix *** source=(${source[@]} CVE-2013-6891.patch CVE-2014-2856.patch CVE-2014-3537.patch - CVE-2014-5029-5030-5031.patch) + CVE-2014-5029-5030-5031.patch CVE-2014-9679.patch) sha1sums=(${sha1sums[@]} '0d58375b7d7ec99766dc9df27bc82e64f4c4e550' \ '3a6640d65eb8a1f77165352801f81dda7918d609' \ '6ea0b4aaa7a20b01f44e139295a15324f2eaa755' \ - '7e2b5090a2e5777e5d1a480f5c73bd18a025aa34') + '7e2b5090a2e5777e5d1a480f5c73bd18a025aa34' \ + '39024d79c1ad392dd9430198c32e8040db6aad55') # *********** _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
