From patchwork Sun Jul 28 23:20:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anuj Mittal X-Patchwork-Id: 169965 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp537533ile; Sun, 28 Jul 2019 16:22:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwCctV7oaENsVDjefN6m+lPPJIb0k5n2LYErrvC9W+f7+iNdx20bdv1ztViXgEsBLiO6AGV X-Received: by 2002:a17:90a:258b:: with SMTP id k11mr104596336pje.110.1564356135258; Sun, 28 Jul 2019 16:22:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564356135; cv=none; d=google.com; s=arc-20160816; b=pieHo4K8JVV0jHyh7u1xO/JQWW0H5PYD6p0zdOAo4f7OEaabnG1Z2SymcuDUWWxolz g5GP/LNr/ru4r+x7OPO4XPYw5vpR1+tvBcJVdxSPbVNniSPI9KD3CBz7eX6o887sT9jR pOj8+GMGR0lQp1OoRy+3TQey4w6JM4l3Jcvb0h1KzPgX0MlCs2HRfINbSmDRWhXlK2ZC bytxKNHkyfEFc6CI+re2M+gu9FoTD2Jpcxr6NKtxYMaHTUzqHIwu4GCMLuosFV6of4/h Qp2/jol0u7jAcUPz/rIQ+yaTjgs74bcvYtaM256z4UtSXz4TqGfi+zM58o12nb7dUexO qTbw== 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:delivered-to; bh=IruEmEKtV9SALmqtkYT8Es+l37g//QMrxNsIQ/o/im8=; b=BNfqdL/oge7pGizhBs1FNk5IwnI3MxM5m4hwTg+plM5DVfSKtGav7Cd7v+DIjrtaRV ZqDgMvn8MQnM5T2sOlrpwnGZ8cmXvx4Fmk+NZSQJp90HWO75DC99EcgVU/tIn8Ce4fhd 6NKXmAZTPrL0a2J2C7RFwQDlVl2eLgVI9KX2lY3dsRVU39e1Ffu21NG5eoVudGGRdEKw 6j1ENzrEQZImc8DsypV8pefCK3Wa/ZoyxDEodmhKVVNHTxHxMNuWuzyVn2zKusVqnA+r uOvPrfZYvCKu30qbyMc/JEmSAC0buWvCUmVJky6pUW5nONgSrSQLz15jBSZACtcBD7Df fM+A== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v27si26508335pgn.14.2019.07.28.16.22.14; Sun, 28 Jul 2019 16:22:15 -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; 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=NONE dis=NONE) header.from=intel.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 ADA0F7F24F; Sun, 28 Jul 2019 23:21:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mail.openembedded.org (Postfix) with ESMTP id C06547F1F8 for ; Sun, 28 Jul 2019 23:21:12 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jul 2019 16:21:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,320,1559545200"; d="scan'208";a="346424881" Received: from andromeda02.png.intel.com ([10.221.183.11]) by orsmga005.jf.intel.com with ESMTP; 28 Jul 2019 16:21:13 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jul 2019 07:20:59 +0800 Message-Id: <1564356060-13772-6-git-send-email-anuj.mittal@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1564356060-13772-1-git-send-email-anuj.mittal@intel.com> References: <1564356060-13772-1-git-send-email-anuj.mittal@intel.com> Subject: [OE-core] [thud][PATCH 6/7] libcroco: fix CVE-2017-7961 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: 480f15850820746cecdfe0b8450b2be484c1f8f9) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libcroco/libcroco/CVE-2017-7961.patch | 45 ++++++++++++++++++++++ meta/recipes-support/libcroco/libcroco_0.6.12.bb | 4 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libcroco/libcroco/CVE-2017-7961.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-support/libcroco/libcroco/CVE-2017-7961.patch b/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch new file mode 100644 index 0000000..35471ec --- /dev/null +++ b/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch @@ -0,0 +1,45 @@ +CVE: CVE-2017-7961 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Sun, 16 Apr 2017 13:56:09 +0200 +Subject: [PATCH] tknzr: support only max long rgb values + +This fixes a possible out of bound when reading rgbs which +are longer than the support MAXLONG +--- + src/cr-tknzr.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c +index 1a7cfeb..1548c35 100644 +--- a/src/cr-tknzr.c ++++ b/src/cr-tknzr.c +@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) + status = cr_tknzr_parse_num (a_this, &num); + ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); + ++ if (num->val > G_MAXLONG) { ++ status = CR_PARSING_ERROR; ++ goto error; ++ } ++ + red = num->val; + cr_num_destroy (num); + num = NULL; +@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) + status = cr_tknzr_parse_num (a_this, &num); + ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); + ++ if (num->val > G_MAXLONG) { ++ status = CR_PARSING_ERROR; ++ goto error; ++ } ++ + PEEK_BYTE (a_this, 1, &next_bytes[0]); + if (next_bytes[0] == '%') { + SKIP_CHARS (a_this, 1); +-- +2.18.1 diff --git a/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/meta/recipes-support/libcroco/libcroco_0.6.12.bb index 5b962ee..f95a583 100644 --- a/meta/recipes-support/libcroco/libcroco_0.6.12.bb +++ b/meta/recipes-support/libcroco/libcroco_0.6.12.bb @@ -16,7 +16,9 @@ BINCONFIG = "${bindir}/croco-0.6-config" inherit gnomebase gtk-doc binconfig-disabled -SRC_URI += "file://CVE-2017-7960.patch" +SRC_URI += "file://CVE-2017-7960.patch \ + file://CVE-2017-7961.patch \ + " SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860"