diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-16 00:59:15 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-16 01:02:01 -0400 |
| commit | 8e28d22c914122aa7bfb70847370d8ae0f070688 (patch) | |
| tree | 14ffa1b7954a3f67c4057bc03ab35c993e98120f /gnu/packages/patches/libtiff-CVE-2012-4564.patch | |
| parent | 7d02724b7bddb4d5e1cc93db99f737baa26840ca (diff) | |
| download | guix-8e28d22c914122aa7bfb70847370d8ae0f070688.tar guix-8e28d22c914122aa7bfb70847370d8ae0f070688.tar.gz | |
gnu: libtiff: Add fixes for several CVEs.
* gnu/packages/patches/libtiff-CVE-2012-4564.patch,
gnu/packages/patches/libtiff-CVE-2013-1960.patch,
gnu/packages/patches/libtiff-CVE-2013-1961.patch,
gnu/packages/patches/libtiff-CVE-2013-4231.patch,
gnu/packages/patches/libtiff-CVE-2013-4232.patch,
gnu/packages/patches/libtiff-CVE-2013-4243.patch,
gnu/packages/patches/libtiff-CVE-2013-4244.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt2.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt3.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt4.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt1.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt2.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt3.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt4.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt5.patch,
gnu/packages/patches/libtiff-CVE-2014-8129.patch,
gnu/packages/patches/libtiff-CVE-2014-9330.patch,
gnu/packages/patches/libtiff-CVE-2014-9655.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/image.scm (libtiff)[source]: Add patches.
Diffstat (limited to 'gnu/packages/patches/libtiff-CVE-2012-4564.patch')
| -rw-r--r-- | gnu/packages/patches/libtiff-CVE-2012-4564.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/gnu/packages/patches/libtiff-CVE-2012-4564.patch b/gnu/packages/patches/libtiff-CVE-2012-4564.patch new file mode 100644 index 0000000000..472f9ca35f --- /dev/null +++ b/gnu/packages/patches/libtiff-CVE-2012-4564.patch @@ -0,0 +1,33 @@ +Copied from Debian + +Index: tiff-4.0.3/tools/ppm2tiff.c +=================================================================== +--- tiff-4.0.3.orig/tools/ppm2tiff.c 2013-06-23 10:36:50.779629492 -0400 ++++ tiff-4.0.3/tools/ppm2tiff.c 2013-06-23 10:36:50.775629494 -0400 +@@ -89,6 +89,7 @@ + int c; + extern int optind; + extern char* optarg; ++ tmsize_t scanline_size; + + if (argc < 2) { + fprintf(stderr, "%s: Too few arguments\n", argv[0]); +@@ -237,8 +238,16 @@ + } + if (TIFFScanlineSize(out) > linebytes) + buf = (unsigned char *)_TIFFmalloc(linebytes); +- else +- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ else { ++ scanline_size = TIFFScanlineSize(out); ++ if (scanline_size != 0) ++ buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ else { ++ fprintf(stderr, "%s: scanline size overflow\n",infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ } + if (resolution > 0) { + TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); + TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); |