Control: tags 877379 + patch Control: tags 877379 + pending Dear maintainer,
I've prepared an NMU for mupdf (versioned as 1.11+ds1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards, Salvatore
diff -Nru mupdf-1.11+ds1/debian/changelog mupdf-1.11+ds1/debian/changelog --- mupdf-1.11+ds1/debian/changelog 2017-09-24 08:56:00.000000000 +0200 +++ mupdf-1.11+ds1/debian/changelog 2017-10-08 10:37:23.000000000 +0200 @@ -1,3 +1,14 @@ +mupdf (1.11+ds1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Don't use xps font if it could not be loaded (CVE-2017-14685) + (Closes: #877379) + * Check name, comment and meta size field signs (CVE-2017-14686) + (Closes: #877379) + * Handle non-tags in tag name comparisons (CVE-2017-14687) (Closes: #877379) + + -- Salvatore Bonaccorso <car...@debian.org> Sun, 08 Oct 2017 10:37:23 +0200 + mupdf (1.11+ds1-1) unstable; urgency=medium * New upstream version 1.11+ds1 diff -Nru mupdf-1.11+ds1/debian/patches/0003-Fix-698539-Don-t-use-xps-font-if-it-could-not-be-loa.patch mupdf-1.11+ds1/debian/patches/0003-Fix-698539-Don-t-use-xps-font-if-it-could-not-be-loa.patch --- mupdf-1.11+ds1/debian/patches/0003-Fix-698539-Don-t-use-xps-font-if-it-could-not-be-loa.patch 1970-01-01 01:00:00.000000000 +0100 +++ mupdf-1.11+ds1/debian/patches/0003-Fix-698539-Don-t-use-xps-font-if-it-could-not-be-loa.patch 2017-10-08 10:37:23.000000000 +0200 @@ -0,0 +1,29 @@ +From: Tor Andersson <tor.anders...@artifex.com> +Date: Tue, 19 Sep 2017 15:23:04 +0200 +Subject: Fix 698539: Don't use xps font if it could not be loaded. +Origin: http://git.ghostscript.com/?p=mupdf.git;a=commit;h=ab1a420613dec93c686acbee2c165274e922f82a +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-14685 +Bug-Debian: https://bugs.debian.org/877379 +Bug: https://bugs.ghostscript.com/show_bug.cgi?id=698539 + +xps_load_links_in_glyphs did not cope with font loading failures. +--- + source/xps/xps-link.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/source/xps/xps-link.c b/source/xps/xps-link.c +index c07e0d76..c26a8d99 100644 +--- a/source/xps/xps-link.c ++++ b/source/xps/xps-link.c +@@ -91,6 +91,8 @@ xps_load_links_in_glyphs(fz_context *ctx, xps_document *doc, const fz_matrix *ct + bidi_level = atoi(bidi_level_att); + + font = xps_lookup_font(ctx, doc, base_uri, font_uri_att, style_att); ++ if (!font) ++ return; + text = xps_parse_glyphs_imp(ctx, doc, &local_ctm, font, fz_atof(font_size_att), + fz_atof(origin_x_att), fz_atof(origin_y_att), + is_sideways, bidi_level, indices_att, unicode_att); +-- +2.11.0 + diff -Nru mupdf-1.11+ds1/debian/patches/0004-Fix-698540-Check-name-comment-and-meta-size-field-si.patch mupdf-1.11+ds1/debian/patches/0004-Fix-698540-Check-name-comment-and-meta-size-field-si.patch --- mupdf-1.11+ds1/debian/patches/0004-Fix-698540-Check-name-comment-and-meta-size-field-si.patch 1970-01-01 01:00:00.000000000 +0100 +++ mupdf-1.11+ds1/debian/patches/0004-Fix-698540-Check-name-comment-and-meta-size-field-si.patch 2017-10-08 10:37:23.000000000 +0200 @@ -0,0 +1,29 @@ +From: Tor Andersson <tor.anders...@artifex.com> +Date: Tue, 19 Sep 2017 16:33:38 +0200 +Subject: Fix 698540: Check name, comment and meta size field signs. +Origin: http://git.ghostscript.com/?p=mupdf.git;a=commit;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-14686 +Bug-Debian: https://bugs.debian.org/877379 +Bug: https://bugs.ghostscript.com/show_bug.cgi?id=698540 + +--- + source/fitz/unzip.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/source/fitz/unzip.c b/source/fitz/unzip.c +index f2d4f322..0bcce0fd 100644 +--- a/source/fitz/unzip.c ++++ b/source/fitz/unzip.c +@@ -141,6 +141,9 @@ static void read_zip_dir_imp(fz_context *ctx, fz_zip_archive *zip, int start_off + (void) fz_read_int32_le(ctx, file); /* ext file atts */ + offset = fz_read_int32_le(ctx, file); + ++ if (namesize < 0 || metasize < 0 || commentsize < 0) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "invalid size in zip entry"); ++ + name = fz_malloc(ctx, namesize + 1); + n = fz_read(ctx, file, (unsigned char*)name, namesize); + if (n < (size_t)namesize) +-- +2.11.0 + diff -Nru mupdf-1.11+ds1/debian/patches/0005-Fix-698558-Handle-non-tags-in-tag-name-comparisons.patch mupdf-1.11+ds1/debian/patches/0005-Fix-698558-Handle-non-tags-in-tag-name-comparisons.patch --- mupdf-1.11+ds1/debian/patches/0005-Fix-698558-Handle-non-tags-in-tag-name-comparisons.patch 1970-01-01 01:00:00.000000000 +0100 +++ mupdf-1.11+ds1/debian/patches/0005-Fix-698558-Handle-non-tags-in-tag-name-comparisons.patch 2017-10-08 10:37:23.000000000 +0200 @@ -0,0 +1,125 @@ +From: Tor Andersson <tor.anders...@artifex.com> +Date: Tue, 19 Sep 2017 17:17:12 +0200 +Subject: Fix 698558: Handle non-tags in tag name comparisons. +Origin: http://git.ghostscript.com/?p=mupdf.git;a=commit;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-14687 +Bug-Debian: https://bugs.debian.org/877379 +Bug: https://bugs.ghostscript.com/show_bug.cgi?id=698558 + +Use fz_xml_is_tag instead of fz_xml_tag && !strcmp idiom. +--- + source/html/css-apply.c | 2 +- + source/svg/svg-run.c | 2 +- + source/xps/xps-common.c | 6 +++--- + source/xps/xps-glyphs.c | 2 +- + source/xps/xps-path.c | 4 ++-- + source/xps/xps-resource.c | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/source/html/css-apply.c b/source/html/css-apply.c +index de554908..6a91df0d 100644 +--- a/source/html/css-apply.c ++++ b/source/html/css-apply.c +@@ -328,7 +328,7 @@ match_selector(fz_css_selector *sel, fz_xml *node) + + if (sel->name) + { +- if (strcmp(sel->name, fz_xml_tag(node))) ++ if (!fz_xml_is_tag(node, sel->name)) + return 0; + } + +diff --git a/source/svg/svg-run.c b/source/svg/svg-run.c +index f974c675..5302c640 100644 +--- a/source/svg/svg-run.c ++++ b/source/svg/svg-run.c +@@ -1044,7 +1044,7 @@ svg_run_use(fz_context *ctx, fz_device *dev, svg_document *doc, fz_xml *root, co + fz_xml *linked = fz_tree_lookup(ctx, doc->idmap, xlink_href_att + 1); + if (linked) + { +- if (!strcmp(fz_xml_tag(linked), "symbol")) ++ if (fz_xml_is_tag(linked, "symbol")) + svg_run_use_symbol(ctx, dev, doc, root, linked, &local_state); + else + svg_run_element(ctx, dev, doc, linked, &local_state); +diff --git a/source/xps/xps-common.c b/source/xps/xps-common.c +index cc7fed94..f2f9b93c 100644 +--- a/source/xps/xps-common.c ++++ b/source/xps/xps-common.c +@@ -47,7 +47,7 @@ xps_parse_brush(fz_context *ctx, xps_document *doc, const fz_matrix *ctm, const + else if (fz_xml_is_tag(node, "RadialGradientBrush")) + xps_parse_radial_gradient_brush(ctx, doc, ctm, area, base_uri, dict, node); + else +- fz_warn(ctx, "unknown brush tag: %s", fz_xml_tag(node)); ++ fz_warn(ctx, "unknown brush tag"); + } + + void +@@ -85,7 +85,7 @@ xps_begin_opacity(fz_context *ctx, xps_document *doc, const fz_matrix *ctm, cons + if (opacity_att) + opacity = fz_atof(opacity_att); + +- if (opacity_mask_tag && !strcmp(fz_xml_tag(opacity_mask_tag), "SolidColorBrush")) ++ if (fz_xml_is_tag(opacity_mask_tag, "SolidColorBrush")) + { + char *scb_opacity_att = fz_xml_att(opacity_mask_tag, "Opacity"); + char *scb_color_att = fz_xml_att(opacity_mask_tag, "Color"); +@@ -129,7 +129,7 @@ xps_end_opacity(fz_context *ctx, xps_document *doc, char *base_uri, xps_resource + + if (opacity_mask_tag) + { +- if (strcmp(fz_xml_tag(opacity_mask_tag), "SolidColorBrush")) ++ if (!fz_xml_is_tag(opacity_mask_tag, "SolidColorBrush")) + fz_pop_clip(ctx, dev); + } + } +diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c +index 29dc5b39..5b26d780 100644 +--- a/source/xps/xps-glyphs.c ++++ b/source/xps/xps-glyphs.c +@@ -592,7 +592,7 @@ xps_parse_glyphs(fz_context *ctx, xps_document *doc, const fz_matrix *ctm, + + /* If it's a solid color brush fill/stroke do a simple fill */ + +- if (fill_tag && !strcmp(fz_xml_tag(fill_tag), "SolidColorBrush")) ++ if (fz_xml_is_tag(fill_tag, "SolidColorBrush")) + { + fill_opacity_att = fz_xml_att(fill_tag, "Opacity"); + fill_att = fz_xml_att(fill_tag, "Color"); +diff --git a/source/xps/xps-path.c b/source/xps/xps-path.c +index 6faeb0ca..021d2021 100644 +--- a/source/xps/xps-path.c ++++ b/source/xps/xps-path.c +@@ -879,14 +879,14 @@ xps_parse_path(fz_context *ctx, xps_document *doc, const fz_matrix *ctm, char *b + if (!data_att && !data_tag) + return; + +- if (fill_tag && !strcmp(fz_xml_tag(fill_tag), "SolidColorBrush")) ++ if (fz_xml_is_tag(fill_tag, "SolidColorBrush")) + { + fill_opacity_att = fz_xml_att(fill_tag, "Opacity"); + fill_att = fz_xml_att(fill_tag, "Color"); + fill_tag = NULL; + } + +- if (stroke_tag && !strcmp(fz_xml_tag(stroke_tag), "SolidColorBrush")) ++ if (fz_xml_is_tag(stroke_tag, "SolidColorBrush")) + { + stroke_opacity_att = fz_xml_att(stroke_tag, "Opacity"); + stroke_att = fz_xml_att(stroke_tag, "Color"); +diff --git a/source/xps/xps-resource.c b/source/xps/xps-resource.c +index c2292e60..8e81ab83 100644 +--- a/source/xps/xps-resource.c ++++ b/source/xps/xps-resource.c +@@ -84,7 +84,7 @@ xps_parse_remote_resource_dictionary(fz_context *ctx, xps_document *doc, char *b + if (!xml) + return NULL; + +- if (strcmp(fz_xml_tag(xml), "ResourceDictionary")) ++ if (!fz_xml_is_tag(xml, "ResourceDictionary")) + { + fz_drop_xml(ctx, xml); + fz_throw(ctx, FZ_ERROR_GENERIC, "expected ResourceDictionary element"); +-- +2.11.0 + diff -Nru mupdf-1.11+ds1/debian/patches/series mupdf-1.11+ds1/debian/patches/series --- mupdf-1.11+ds1/debian/patches/series 2017-09-24 07:23:10.000000000 +0200 +++ mupdf-1.11+ds1/debian/patches/series 2017-10-08 10:37:23.000000000 +0200 @@ -1,2 +1,5 @@ 0001-mupdf_manpage.patch 0002-Fix-build-with-system-libopjnjp2.patch +0003-Fix-698539-Don-t-use-xps-font-if-it-could-not-be-loa.patch +0004-Fix-698540-Check-name-comment-and-meta-size-field-si.patch +0005-Fix-698558-Handle-non-tags-in-tag-name-comparisons.patch
