From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/cairo: fix CVE-2018-19876
Date: Sun, 1 Mar 2020 16:42:35 +0100 [thread overview]
Message-ID: <20200301154235.GL8743@scaer> (raw)
In-Reply-To: <20200229200016.3448256-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2020-02-29 21:00 +0100, Fabrice Fontaine spake thusly:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
As per Peter's review, this is a long shot for a security fix: better
backport the two patches (+autoreconf) for master. The version bump can
then be respun for next or after the merge.
I've marked this as chages-requested in patchwork.
Regards,
Yann E. MORIN.
> ---
> ...vailable-in-cairo_ft_apply_variation.patch | 33 +++++++++++++++++++
> package/cairo/cairo.mk | 3 ++
> 2 files changed, 36 insertions(+)
> create mode 100644 package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
>
> diff --git a/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch b/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
> new file mode 100644
> index 0000000000..10e000d16f
> --- /dev/null
> +++ b/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
> @@ -0,0 +1,33 @@
> +From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
> +From: Carlos Garcia Campos <cgarcia@igalia.com>
> +Date: Mon, 19 Nov 2018 12:33:07 +0100
> +Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
> + cairo_ft_apply_variations
> +
> +Fixes a crash when using freetype >= 2.9
> +[Retrieved from:
> +https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + src/cairo-ft-font.c | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
> +index 325dd61b4..981973f78 100644
> +--- a/src/cairo-ft-font.c
> ++++ b/src/cairo-ft-font.c
> +@@ -2393,7 +2393,11 @@ skip:
> + done:
> + free (coords);
> + free (current_coords);
> ++#if HAVE_FT_DONE_MM_VAR
> ++ FT_Done_MM_Var (face->glyph->library, ft_mm_var);
> ++#else
> + free (ft_mm_var);
> ++#endif
> + }
> + }
> +
> +--
> +2.24.1
> +
> diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
> index 902f505aaa..c6a3dad932 100644
> --- a/package/cairo/cairo.mk
> +++ b/package/cairo/cairo.mk
> @@ -11,6 +11,9 @@ CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
> CAIRO_SITE = http://cairographics.org/releases
> CAIRO_INSTALL_STAGING = YES
>
> +# 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
> +CAIRO_IGNORE_CVES += CVE-2018-19876
> +
> # relocation truncated to fit: R_68K_GOT16O
> ifeq ($(BR2_m68k_cf),y)
> CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot"
> --
> 2.25.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-03-01 15:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 20:00 [Buildroot] [PATCH 1/1] package/cairo: fix CVE-2018-19876 Fabrice Fontaine
2020-02-29 22:16 ` Peter Korsgaard
2020-03-01 15:42 ` Yann E. MORIN [this message]
2020-03-01 15:53 ` Baruch Siach
2020-03-01 16:21 ` Yann E. MORIN
2020-03-01 16:27 ` Yann E. MORIN
2020-03-14 18:09 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200301154235.GL8743@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox