From patchwork Sun Sep 1 14:35:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 172718 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3182598ily; Sun, 1 Sep 2019 07:37:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoVzomi0O/r4g+/BZyJTRP6bl03xSv1J2FupfkgBYJ1b0Jro3X9xC40vFJHBQXgmxNjTLK X-Received: by 2002:a17:902:b202:: with SMTP id t2mr26061276plr.303.1567348643563; Sun, 01 Sep 2019 07:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567348643; cv=none; d=google.com; s=arc-20160816; b=xYzENeEf2KbMeQH2kln7s+mVuZcJOVzBznghyUgFb5Ixzc4lvarzhji2oTi3kcU2dF F4kjkJ0sOECztxgPRN/ahDyAZdm4L/AmH490eA88jo1hibsXm4tbkLWkmZlW0ffdbhDX YCF1L1csudyYVxouLg2uAXnpYxjzjJ/dwkhmR1KEx5Tde/sU7Mp4AEz/DShvIVTUdANI lk1Smfgp6sTCu6QL9VEJpsKpWLu4RSoYJVuLY2JVUzAPxpz9lj7J/kU9BLFneHt+vNgU qtedd2S7IFPYo044q/ihEx8JiWRp8Fejt/kxUzb0jsgTiPCqJRXuQbn8RMRkUEWztS1y Rfqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=K+96q/3v4nv+uCw8l4wMbDdxybsEghDjQ39WlnqLAmo=; b=KgpcOYY4xvtcaxTOTa/RpUZgp+aFJwhAv2bF6vDdxtZttdleo/4oz3SYieGbrHShb2 zEqdL3woVq1fWmtmhAn4/uNzpBiWsJbc4A7+pPhoB95WHuPwu+wMwqrpU2ge4Zp7JLl6 dYYUbjTavfB1g6iADKAFapG+Z8ncgVyUfouIjx1SyY6aJKcd/i9nx28OqruUyqHW0S+Q xsHVLBf64ReEWJ5gWAdgwCRZ3xE5QA115shmWv6PRtJOzq5jSD4BAQ284fag8N6GmAp1 +ZVXdZfrDlyh+qfD1znqt702HTgMhqHrwhhSa6AvjBoTrUOtoLoXTpV9SG7cKIL9nUQn hcpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=R+kphv2O; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b25si1433195pgm.266.2019.09.01.07.37.23; Sun, 01 Sep 2019 07:37:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=R+kphv2O; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 61ADF7F4B9; Sun, 1 Sep 2019 14:36:51 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mail.openembedded.org (Postfix) with ESMTP id E6C6F7F41E for ; Sun, 1 Sep 2019 14:36:29 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id i18so5923171pgl.11 for ; Sun, 01 Sep 2019 07:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=dQOskvLO4+Pm/JYq2/qiTkf+C0DW09nZSD+JVJDcubw=; b=R+kphv2Of8iJlstmOMVmzZpJZXFCyzu5LEsVh3H9srdQcR44YTg9LwyxeY1zqt4Hn4 X8ztYKGQTOujSFpttQC2DXf81uhMo/ED3zVqmmI8pT64wZLh0TZ+yGIINFq49YrLCpAA MY083o1WBJpB5bQdX1+uHyRLBFQYHQiTwVZHA++uULdk4fJU5yVk2p8XiBD6506P+T7v V3SAO/HXS/KHA6U+D04WdJcHnh1B44q3tbdoy8+lsWlsD+337PXvnU6EeS9qIPDZL2V9 iuEkONNe42eaV921IA+s8ePkEIqcR2hbOnTJ2e3r7LadWxVwTJfrVYZwq7RXipOOoKNY 85VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dQOskvLO4+Pm/JYq2/qiTkf+C0DW09nZSD+JVJDcubw=; b=hsiaozFMkJkXhuVg21/XCJCLSdA7AHOwW5Kf+qUZiVPjfgaFlwwMS/uMCmzSXuSLXJ wo+Fesumnu936xuc6jCzD7TIUjpKND3Put69IA5PAt8Hm3r7crbK/P3PVGRwh5LVkA2G E+MoaGTjdiCj4HkBBPAnKj3uo5W3Kt9nTlXdhGtFjAKLO7F3z9JkOwG/Ek17dnBbVrHt btHrhK23poPCuBCOlW8SpOhbW23PWC44XaohyIiIXm73xFN036IPQLC+rDZY0jc8XCAg ZFLedrsiylsJS/Hy+ecTO3B9poqeU1dhSaqSxmPskrtR4+AKo5D343dXOJKgcoJpQvJl FJVw== X-Gm-Message-State: APjAAAUFkCaAaVxiw97JwIq+koI2Uj1FLRSjG0IzFK70ZDRhVfi8VzR3 P0XcvgCFST5QQcwInpI+KwgA8S33 X-Received: by 2002:a17:90a:c501:: with SMTP id k1mr1998410pjt.37.1567348590866; Sun, 01 Sep 2019 07:36:30 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:c33:1d53:5246:e59:bfe9]) by smtp.gmail.com with ESMTPSA id s16sm15911381pfs.6.2019.09.01.07.36.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Sep 2019 07:36:30 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sun, 1 Sep 2019 07:35:44 -0700 Message-Id: <027618ebbac58a05da0cfd27be113195341f3588.1567348433.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior 06/43] libid3tag: handle unknown encodings (CVE-2017-11550) X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton (From OE-Core rev: 5090afc1b07e62f70ebcf63a7abb75b8552f0a52) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libid3tag/libid3tag/unknown-encoding.patch | 39 ++++++++++++++++++++++ .../libid3tag/libid3tag_0.15.1b.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch b/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch new file mode 100644 index 0000000..f0867b5 --- /dev/null +++ b/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch @@ -0,0 +1,39 @@ +In case of an unknown/invalid encoding, id3_parse_string() will +return NULL, but the return value wasn't checked resulting +in segfault in id3_ucs4_length(). This is the only place +the return value wasn't checked. + +Patch taken from Debian: +https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/ + +CVE: CVE-2017-11550 +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf +--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 +@@ -236,6 +236,10 @@ + + encoding = id3_parse_uint(&data, 1); + string = id3_parse_string(&data, end - data, encoding, 0); ++ if (!string) ++ { ++ continue; ++ } + + if (id3_ucs4_length(string) < 4) { + free(string); +diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c +--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 +@@ -165,6 +165,9 @@ + case ID3_FIELD_TEXTENCODING_UTF_8: + ucs4 = id3_utf8_deserialize(ptr, length); + break; ++ default: ++ /* FIXME: Unknown encoding! Print warning? */ ++ return NULL; + } + + if (ucs4 && !full) { diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index 43edd3f..0312a61 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \ file://obsolete_automake_macros.patch \ file://0001-Fix-gperf-3.1-incompatibility.patch \ file://10_utf16.patch \ + file://unknown-encoding.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/" UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P.*)/$" From patchwork Sun Sep 1 14:35:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 172719 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3182717ily; Sun, 1 Sep 2019 07:37:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqwor7KEhdzEAY88V3dv6n32LTZLqx5QzzvhsEsDmPIh0L/nIYtJLP/YZk0PGMVN92Qyir0D X-Received: by 2002:a65:6552:: with SMTP id a18mr21836786pgw.208.1567348651127; Sun, 01 Sep 2019 07:37:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567348651; cv=none; d=google.com; s=arc-20160816; b=Lsvjh4I8S8QQIhyIp3T4Vasc8T8VCz/BV524CKuGxH++x4IP9A0LWqSrU3EHBuEi3u kOy7yfQOkPXDXC2ZvlxfIur5znwTv6KMfZqx3/2RlJYX/V/5TkHIppKke1Qz8fe/5rfo Ya25CHb1PBMjI3GeDtgZKgFsjJwgPd9D6hipkFOb+liJRSkPuDPhHzpaGn0jNGgpTR9G X51BsX4LBp1QZ9knzyr7Ux0prj+S6qEjFeiu71n88/3/Y/VkD4/pZSub6PfoqhoHd71A YFsO/E1sh7Ddl7GzHZqI/iawUIDuT+iDIKUpEAltwldWodnwYzi7Z+ttlIZq67vku3me 1AUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=aw/kiuQuw8PHySoV4AVgBQQGcyNQI2dfE18pzDOGe4w=; b=LKtRKuyDFXZKnyonB19FUNolqo2vOOGU6QlOdWSqe9ZhKE7x27O/3xAUi+ozb+SdCI RP9u9HOrzPoJYhZOV6AXPUhK8Ra5zglAvzFitZRRVBRWZYLG/lAFXXxiNCQECnPLZins RhqSZ14raUFaUxIFgwOdE2DbOb597lS7ueVdlw24s46OgS9INqhHb79NqBqBdO+tjz5I Q3qm/q2qFqDcjW+oAz7SNeRuRPOMhmcC4g0BfvG8p9RoXgnx/LYMTFo0idhW7u9ZBdWQ T+o7rUMJR10ZxcKQ5UomkV2p9ukgiMcApxUIltkeAoQ8dic1HuQQm0SkQgNTjMUYxQCY FcqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IHlSZ6Hw; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k7si10646680pfi.202.2019.09.01.07.37.30; Sun, 01 Sep 2019 07:37:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IHlSZ6Hw; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 98C6C7F4BD; Sun, 1 Sep 2019 14:36:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mail.openembedded.org (Postfix) with ESMTP id C23BA7F41E for ; Sun, 1 Sep 2019 14:36:30 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id q21so2336926pfn.11 for ; Sun, 01 Sep 2019 07:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=nUH7MkGfM3M2BiD7pDQVoBZUwXRw47CBguDNEuVxBTA=; b=IHlSZ6HwZVHioWb7c9adm/qA088N2ZL7beqeXoS8jxFm4N4c8DeiwcVclmcWtElWmr 2uTsPge89CQMEERqTeP38dypMj6ejOambZgQ6y6Q3HH0WXsaKfzwHziJXjyW0XbJ3QDs BQtMKVmaTt4sYSPrDr+53xNkeiaErUIBn8ibrRviE+Zm0aNuBsYG9CMUfc2Dq58FPw+C OwdZg/deq2P+yUTOqxqrstJn6MdUZyi5VSTC3p/BSTwG7qYaQQUE8ASHzreS+Gk7uAS5 jCS9xWPiK8I99rqrSD6WVruYNHFW1NhjKt9NK4UmVgJhRB90tTGsstCBYGdtpoMq9Zww o0fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=nUH7MkGfM3M2BiD7pDQVoBZUwXRw47CBguDNEuVxBTA=; b=HIDMcZWxNo401+BVCzRhg4wfrRayeq67y13g9yCm6M4M6tX1JRWAHmpm8XzB4i1wDx /X8TnHKWRCfbtK7BgUKhEtXoNOoRXhRXYHThpNmYSDjxhYezxMN1jCLDaFQ77uB0cFuX TfXQaGHdS/rP5QP0tfsFJjBxRIBD3FqtAg6GnlNSX+MjiYeFfjX6JN2tmmiMCiYL/jCx 8c5MmWLJeW4eFcAwSnne9ys9GuEa4qht12Ux2UEJxl18GYCclHh3DXa0f8YBV6PumPR5 4sI6VRQl6wwPqI1Jl54Jnjv7cph7HS2vPN3JGXY/l2OmYLzmESq1f6Qx1vA8qsSeIke7 68mw== X-Gm-Message-State: APjAAAXs8RECVLQODWUxcnY8mC0S1DvXPJI34f/VGBDHFkIQeZ+r+nwr 5IgKvSFFiKi/9JJTKwVejmmh5Ree X-Received: by 2002:aa7:8d42:: with SMTP id s2mr29626028pfe.185.1567348591777; Sun, 01 Sep 2019 07:36:31 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:c33:1d53:5246:e59:bfe9]) by smtp.gmail.com with ESMTPSA id s16sm15911381pfs.6.2019.09.01.07.36.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Sep 2019 07:36:31 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sun, 1 Sep 2019 07:35:45 -0700 Message-Id: <05e4f56159ad4cff83bec10f1355be3ce5864201.1567348433.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior 07/43] libid3tag: CVE-2017-11551 is the same as CVE-2004-2779 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton (From OE-Core rev: 0663e5f8f906803685f018061d51fd6277916e50) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch | 1 + 1 file changed, 1 insertion(+) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch index 8d09ce7..10e0890 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch +++ b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch @@ -6,6 +6,7 @@ https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch Upstream-Status: Pending CVE: CVE-2004-2779 +CVE: CVE-2017-11551 Signed-off-by: Changqing Li From patchwork Sun Sep 1 14:35:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 172720 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3182835ily; Sun, 1 Sep 2019 07:37:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqww+jvZk14JMaFF5H9I8hTdgni98MbRcjLBVurOEmf80EklSJl1/udt1jg40xsMeOdH/tec X-Received: by 2002:a17:902:169:: with SMTP id 96mr24443978plb.297.1567348658439; Sun, 01 Sep 2019 07:37:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567348658; cv=none; d=google.com; s=arc-20160816; b=GIZdLxZNgYVPjBlBUtKtrZSXg6YUno8wBPRdUAGrNPo22KejtupRD1zFAX5tNKs5o0 kxruPg5ij2Df4eWPS7oQxrPPhLoI/N+j8W6B0Lx027/uhRt0anN7XF6+WPIs5680/IP8 oYx9p7HqgpZ0se0sUgVvLAETZUChb0zasQ573Rhzf3WniMzkmQD11LKPDH00RN179Kmt UySlgijh3mzvRCMYvjUCwgNKzkzGEuEric/P+JGhD24vWonjyweje/4BRtuX9Pv/IX2+ e22eP5YQmE+Fc6qVwaoNfFhz46si0RR1qb1nd3UlRqBzYl7MT/VCNS5ljDLeitUHsekd lp4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=nKs4YIwZOUIpV8SfjeDKgom8cicln2RO4591jzg9lHg=; b=r01v/J+ucfJeXraOZ1CCzaY4Ni7mXY0oxb3AB+Bj96lpPNO/rDqq35BXR9IqYIfGhz jK5yOgfyEcdR8Fokw36RWww2JtRFSNCAqdRt4khy2jv8MCfsgCfVZO/haRjsqZHFl5hM k6zJWv9juCAvs5sOWlSU49RPwhzCkqNMEwbdcSd2tBkk/Nkh2nT0W0Iv3HRcfJHjjGEs NL+S7+rOH3AJ7bFHc7bWmR/zpRu9JfiTX+F6wMBCCT5/xa3dIGADg7VR8xDm814J13WB AGGxb8bFcQkvY0hBqsPjG6uT9618TsNhW2sdeDqxXak4i4H5k/yfQO9LGvQN7e4Vb/An yifw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qOoxvYaG; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c67si11552931pfb.211.2019.09.01.07.37.38; Sun, 01 Sep 2019 07:37:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qOoxvYaG; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E091E7F4A4; Sun, 1 Sep 2019 14:36:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mail.openembedded.org (Postfix) with ESMTP id 00F107F421 for ; Sun, 1 Sep 2019 14:36:31 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id y9so7380418pfl.4 for ; Sun, 01 Sep 2019 07:36:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=hnT581ksGjvHz3tiL++Grc54cuBUBtoclFnz+7uX0dY=; b=qOoxvYaGtTxlMHWDSDgGp5bc/NHz1uZ6ZFs8f7O7lU8cHaBU+/zukY/mxNrkE5VDxe og94TeHwkvKdZnkkupt05MM+gapZlnjLDxXuDX/dbvjOrfmKQzH4O7GHOSznGwLSwc+i sPD4udxeaGlxWI+wTEqOea0eDmtdnBpKOznETmCTaf5tzEdQlCkxtELFNa6SknoRQ6la 6ccF4U2H4EJLaJ0qjwk/2NImhr1w9SBb5+Aj2eGqKCCT7goR7xDE5EjFSSzJ2iQh5N2Y oTUUpN/DzNg/RvgDkY7O2OQMRW/YuBJuTbyENAmG0XSUcydNqTsGbitPmBCETYrLrH2z gwMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hnT581ksGjvHz3tiL++Grc54cuBUBtoclFnz+7uX0dY=; b=aqJCYMcmhBzaMdYxXXsJCa2Vm/YM6qZBbNhgeEd+xmQQFAUQ9i0VoZ7xlCMJRLRvDe teZfK/+HMMTG10DT4PkH32uW5poiiPW0bXh7OJr3g9oumniu92lw5Dv4zekLiwRU9QGk 7evyacIFxQbk5mqTiEFCWl75ua4k8JfRyWokjTzQhOzp50MI0OblTv0pxTcgjuOrYamn IjRkzVXZKDJXIwP8niGvwXVg+KYHm4M8oCDIgdxBh3xBdNOLxSmj2N+9ooX6GLxpQUGN 0ZWSpBQ/4G1zYjAlE4DdxDjVlKl5m6dSPbo7Wkjxgs2EomFpOHDgQB85s2vOdTlDZaXE uiZg== X-Gm-Message-State: APjAAAXMQNgxiXYfLOvpJLmV2AsU5cHK7dddaKhQ7ZxIhzuT8Gv5HhKd y19/KLaZbB1NCjvgM2C9eyIpWL7G X-Received: by 2002:a17:90a:3462:: with SMTP id o89mr3850970pjb.2.1567348592859; Sun, 01 Sep 2019 07:36:32 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:c33:1d53:5246:e59:bfe9]) by smtp.gmail.com with ESMTPSA id s16sm15911381pfs.6.2019.09.01.07.36.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Sep 2019 07:36:32 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sun, 1 Sep 2019 07:35:46 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior 08/43] tiff: fix CVE-2019-6128 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton (From OE-Core rev: 7293e417dd9bdd04fe0fec177a76c9286234ed46) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libtiff/tiff/CVE-2019-6128.patch | 52 ++++++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.0.10.bb | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.patch new file mode 100644 index 0000000..6f1fd4d --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.patch @@ -0,0 +1,52 @@ +CVE: CVE-2019-6128 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001 +From: Scott Gayou +Date: Wed, 23 Jan 2019 15:03:53 -0500 +Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128. + +pal2rgb failed to free memory on a few errors. This was reported +here: http://bugzilla.maptools.org/show_bug.cgi?id=2836. +--- + tools/pal2rgb.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c +index 01d8502ec..9492f1cf1 100644 +--- a/tools/pal2rgb.c ++++ b/tools/pal2rgb.c +@@ -118,12 +118,14 @@ main(int argc, char* argv[]) + shortv != PHOTOMETRIC_PALETTE) { + fprintf(stderr, "%s: Expecting a palette image.\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) { + fprintf(stderr, + "%s: No colormap (not a valid palette image).\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + bitspersample = 0; +@@ -131,11 +133,14 @@ main(int argc, char* argv[]) + if (bitspersample != 8) { + fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + out = TIFFOpen(argv[optind+1], "w"); +- if (out == NULL) ++ if (out == NULL) { ++ (void) TIFFClose(in); + return (-2); ++ } + cpTags(in, out); + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth); + TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength); +-- +2.21.0 diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb index 152fa81..a82d744 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb @@ -6,8 +6,8 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://libtool2.patch \ + file://CVE-2019-6128.patch" " - SRC_URI[md5sum] = "114192d7ebe537912a2b97408832e7fd" SRC_URI[sha256sum] = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4" From patchwork Sun Sep 1 14:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 172721 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3182933ily; Sun, 1 Sep 2019 07:37:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwUXH+lISDOyZ1yR2WkzhIVLUDZzLfNlA8HdjTJLWBIWxL7aP1Ojm/zwQxtZrnlrl1vuGjR X-Received: by 2002:a17:90a:338b:: with SMTP id n11mr8868882pjb.132.1567348666159; Sun, 01 Sep 2019 07:37:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567348666; cv=none; d=google.com; s=arc-20160816; b=SI2dPzhVMsiOGs0XH96+VfEOmVi2kbbzTc6tuwr8eMxbLQTu+ljw+mOHrSTYOJNcJy O5Tducz1GncDpzCAG8wZHnJnUnCrobivsdzOGwRMW4fZe24vKIbmjDGFyHu+GextoYAv zNuIwM+xILixbFPkzIYFe/NheIVlJlRsDlsdkPuCy+xm4G7f+rtkzsw207MY4r6CKGqE 3iFaIfMYHf7ZG9AhDwW/zByEbvqw0aJUd0h0AGcRQAlkqUKtkuUIs5pYUyp2z8A9MU4C 0LuPNRzrERyyfhbDy/mBgQ0ZPJv4F9+7UiX2lvH30/hVvWQVtXg74MYFxM5oJ0C/1SZs AgaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=ejbzneT1czepXYgWGrCA/0uN7Wn1JAehgsQFcWkJe5g=; b=BPQgZiioRB0GHrKrRlHPT6Gs+68++oPiLGPH91zNUFieNMICXpqj5vyH+rpCDmJKgg 6yUZ8dtvYOJ+ZuxWV6SLaMybY6IsvpuVRwIkgvWKuRjXA1Cwx3N+6TPdMw/xUn9Sb4ga Gy+DOMYhMUBmtsYEcw25dsPhSfdfaCkc75HHKE3hGzgAIWlmwStUhJWnb4U0/NPkGGld p4PvolqxFpdMkjBpHDa+DsDE1R3KRx1YRGFoS3nGfG+CDFjvwo+tx/0KYGXxM+b3Dg1M Qh9T1Hisyzw9OWUjGiHbMvFxFT3tK8c6f/hcadHoPXN8Hy5XDId+cBeLCB1HMBKV2Q05 pSfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="ir7LNd/r"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 200si12123989pfu.152.2019.09.01.07.37.45; Sun, 01 Sep 2019 07:37:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="ir7LNd/r"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 24B967F42C; Sun, 1 Sep 2019 14:36:55 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mail.openembedded.org (Postfix) with ESMTP id BBC477F421 for ; Sun, 1 Sep 2019 14:36:32 +0000 (UTC) Received: by mail-pg1-f170.google.com with SMTP id n4so5949459pgv.2 for ; Sun, 01 Sep 2019 07:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=3pIZnIk0lHetOo/VGL1JT/6O03AleRFQfmhuCRz4bmk=; b=ir7LNd/rAOxktD3BcX5R2CxTgdnyagVYtamriTKEZbGB7BB4bXtWixum+1t5c9YxeR pBPaeA/v1mYCbfRarRlCkBjussJVt2wkXwM01YPN7QJtZ6bEJmOk6nG8jvimO2+7dEzE ut12YkZWl9D/Br6TmzxpVbcFyPItnXxjFRQMEM3MF18SaEWWHMKvzxPaoU5rW3Om992K 04Cy9KE6Zk235qfwuPGIkvT/haqDPeqAsNS3mfizSyN1P3F+dNneJAH20KlAZ/LtHZOU 2doqeJABXo15Ovl2ZaAoDgQp8LdjwQyIUr5FCygLu9xxJHOES7NjnAOl0wzdI8VycJRy sklQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3pIZnIk0lHetOo/VGL1JT/6O03AleRFQfmhuCRz4bmk=; b=CrKf8elp5VqPwPX6xpmInq9aTznhl/n9JRr8mBi1C/S8u6iFBJ3rZgWQlA7v3k2308 ozDkreI3aXMCXSWlNJVH9ZJooWRDmkYECYbzPwJEKAxHCZVDmraP319JUpQ0kzuPSij+ 8pGmwHjqxqUzhu0W1kbild6S/r5PPpxggvVAz06QKFnJ22RlqQYkV6L0VH5z05bB2/MG 47DN1jEyKwLLaZ71tj6U8miLhUQbBBbDQvqYcm/bJajFZ7y+tnz7Try5bSAEMHTw05HU x/o14GrBPibaCBkFF4AWW+/U46Mkhzu5denazmBYgiuHV+eX15gBQnXLcA6aUFK0rozp bOgg== X-Gm-Message-State: APjAAAUq8On/E8FpLn123jQ9jz+/RZF+9hBhHflLZRUkqeO72EoSH6MV aNht3ZMkKPHeR8V5ucWuuQ/O8bXn X-Received: by 2002:aa7:957a:: with SMTP id x26mr25821132pfq.16.1567348593606; Sun, 01 Sep 2019 07:36:33 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:c33:1d53:5246:e59:bfe9]) by smtp.gmail.com with ESMTPSA id s16sm15911381pfs.6.2019.09.01.07.36.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Sep 2019 07:36:33 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sun, 1 Sep 2019 07:35:47 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior 09/43] tiff: fix CVE-2019-7663 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton (From OE-Core rev: d06d6910d1ec9374bb15e02809e64e81198731b6) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libtiff/tiff/CVE-2019-7663.patch | 77 ++++++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.0.10.bb | 3 +- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch new file mode 100644 index 0000000..f244fb2 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch @@ -0,0 +1,77 @@ +CVE: CVE-2019-7663 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From c6fc6c1fa895024c86285c58efd6424cf8078f32 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard +Date: Mon, 11 Feb 2019 10:05:33 +0100 +Subject: [PATCH 1/2] check that (Tile Width)*(Samples/Pixel) do no overflow + +fixes bug 2833 +--- + tools/tiffcp.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index 2f406e2d..f0ee2c02 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -1408,7 +1408,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + int status = 1; + uint32 imagew = TIFFRasterScanlineSize(in); + uint32 tilew = TIFFTileRowSize(in); +- int iskew = imagew - tilew*spp; ++ int iskew; + tsize_t tilesize = TIFFTileSize(in); + tdata_t tilebuf; + uint8* bufp = (uint8*) buf; +@@ -1416,6 +1416,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + uint32 row; + uint16 bps = 0, bytes_per_sample; + ++ if (spp > (0x7fffffff / tilew)) ++ { ++ TIFFError(TIFFFileName(in), "Error, cannot handle that much samples per tile row (Tile Width * Samples/Pixel)"); ++ return 0; ++ } ++ iskew = imagew - tilew*spp; + tilebuf = _TIFFmalloc(tilesize); + if (tilebuf == 0) + return 0; +-- +2.20.1 + + +From da6454aa80b9bb3154dfab4e8b21637de47531e0 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard +Date: Mon, 11 Feb 2019 21:42:03 +0100 +Subject: [PATCH 2/2] tiffcp.c: use INT_MAX + +--- + tools/tiffcp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index f0ee2c02..8c81aa4f 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include + +@@ -1416,7 +1417,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + uint32 row; + uint16 bps = 0, bytes_per_sample; + +- if (spp > (0x7fffffff / tilew)) ++ if (spp > (INT_MAX / tilew)) + { + TIFFError(TIFFFileName(in), "Error, cannot handle that much samples per tile row (Tile Width * Samples/Pixel)"); + return 0; +-- +2.20.1 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb index a82d744..8e3e227 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb @@ -6,7 +6,8 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://libtool2.patch \ - file://CVE-2019-6128.patch" + file://CVE-2019-6128.patch \ + file://CVE-2019-7663.patch \ " SRC_URI[md5sum] = "114192d7ebe537912a2b97408832e7fd" SRC_URI[sha256sum] = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4"