From patchwork Mon Mar 5 17:20:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130726 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2934837lja; Mon, 5 Mar 2018 09:23:36 -0800 (PST) X-Google-Smtp-Source: AG47ELtKinJGJ94EqqYcfsBlL2U9OiI/tbTXdPk1rWUNMYwtTWy/jEDeSNjuTBnFx6qniFeix6IS X-Received: by 2002:a17:902:7d93:: with SMTP id a19-v6mr10267099plm.160.1520270616296; Mon, 05 Mar 2018 09:23:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520270616; cv=none; d=google.com; s=arc-20160816; b=pCLP6xJAqXXX0ZW2B+/1ewJEV3vC6KsFIfBW6NlqLH5owvU9QRkgH4UQFtFYYOCue5 fz5SJjuV3UYWnC7KyZi0GmpIkCXDndXwdQ8plUd5eHh+D0W5ACEG8TfFPHdeFeNwruec NqsXnVebZSdpwz5YfBpGCFnBSojwumzGQGkIGoXqRmd+WnQA5u6wYyNkJ7d9MqCWZoJq XXrn4Mg+V1W9+4/kYPuNy+qUn+ifBZyzzlJi9qU0e/7O+ivhaNyGPLa55YQzzEhyIxLl pgFc7gdjSq5Bt1GMwsjT/u9KDgh4SLOnOYwzuTbJGLQ43QiUKUWQpSbqv0YtuLUmzjcS HYSw== 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:arc-authentication-results; bh=NoULvzRQ7nuHPVoQBUXhXRgKcBXYox7uwltbukd+J6E=; b=HMQv4LRfnR/TZdivFynK+OdJw5Zm7BV+0pdcY8JjnN8WGZgHSei+wrMg0XDnI2EgN0 TWmJXTZlqn/eRd9+omzrWObLIP/+eVA9hH9DOmPYYjVgJbVV2dLSI6I9l53MMKKC5HUR P6p8xg7DR2btcVDb/xOZjTN1nbkh9k+cS1O05Hb7PE7WVuFn+OiPSN8AyPrkh5J6NVuM dUxBWVd72Ejr/oQbRDTwaBn3gLU5DVQNu8mJe1hO5RE0CazUDgVpUqtadiZ6KV/Lcb8X s3X+dszK4rUao1VcItxYKWLQEJslAhgz8ThFd9ot9m1buQT2ZdSg8CG7pTNi4ujP2zYQ HPkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=FadpXyE9; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h1-v6si1851243pln.216.2018.03.05.09.23.36; Mon, 05 Mar 2018 09:23:36 -0800 (PST) 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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=FadpXyE9; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2F08778B02; Mon, 5 Mar 2018 17:21:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id EFE6D78A50 for ; Mon, 5 Mar 2018 17:21:10 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id l43so18126150wrc.2 for ; Mon, 05 Mar 2018 09:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=EWpFQ4tniXNiRsS0HeHKVGgRttMDISG3wZoue1ZlIPU=; b=FadpXyE98jJ57FljvNunRuyCs6FVTp81vLtsMvvGeTyIcrlsNda834cbpvVD3z2Fdl 5YX955EiJm4lkUBXvZro8L7bEZqYB/T87n+iPgVZdMli9Be1fNxRSorBVJg8NxmOgQwA NnPHhsl913GjznWqTT055LVLlgL3wmQMfdGqnzDcsth51N2YEf+xSXDMeSUocEIm2Bwh vYXgmRn+vz1LctpsEsXUlpr9A5aIK+ej//28Jb4ZGmEfKNdoV6sX/7XiSwfv95+IvSse C9S7dE7SNRNVXfnGBZy+Yr8nB/KkluDIro/KMk73fMgvo8MElqowZfG4/0lqGjkbQRfO /q6A== 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=EWpFQ4tniXNiRsS0HeHKVGgRttMDISG3wZoue1ZlIPU=; b=eQPbxx6fYFwm2IDKl1HoOgVaH7KohiOU6pzSmmWkPKQIYnd+wFCUkmYxkSvHTMou3F nAz0bY6jzYUDrvwU8GQmzwrKJ5wnQP6WpqbVuY9lJWXw7WtXiAPO5pdId/FYg1z4vxf3 BtauPWzMTAR+HyeSENZ3IZgto0Wu8B/yVGWSSbLXY1zvukupNIs7pxh2w+hfJaCn23dP qqUrkLCSGcwsVdmKghhAECjmuS9/Tl6qX78kL+QJUbmLDcgVSmh373nbgkuyVF3ohUn+ 3iXIXEjwvt2vrpUxcFAuuyQeAs2OBLFy5N95eZFDUECu156/jXviQbFRJDW+i8Pm6f6q x6iA== X-Gm-Message-State: APf1xPAjDcLBck8iDY1zQhoAZQa/Aauii6i25JabEHy5FgrKWnPlYuSg BKKn1un2VUV7dvvObZtDhEENU8YK X-Received: by 10.223.179.17 with SMTP id j17mr12952318wrd.223.1520270471905; Mon, 05 Mar 2018 09:21:11 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id m190sm10082047wmb.6.2018.03.05.09.21.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 09:21:11 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 17:20:37 +0000 Message-Id: <20180305172046.21729-20-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180305172046.21729-1-ross.burton@intel.com> References: <20180305172046.21729-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 20/29] unzip: refresh patches 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 Signed-off-by: Ross Burton --- .../unzip/unzip/10-cve-2014-8140-test-compr-eb.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch index c989df18965..ca4aaadffe1 100644 --- a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch +++ b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch @@ -9,9 +9,11 @@ CVE: CVE-2014-8140 Signed-off-by: Roy Li ---- a/extract.c -+++ b/extract.c -@@ -2232,10 +2232,17 @@ +Index: unzip60/extract.c +=================================================================== +--- unzip60.orig/extract.c ++++ unzip60/extract.c +@@ -2233,10 +2233,17 @@ static int test_compr_eb(__G__ eb, eb_si if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ @@ -30,5 +32,5 @@ Signed-off-by: Roy Li + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) + return IZ_EF_TRUNC; /* no/bad compressed data! */ - if ( - #ifdef INT_16BIT + method = makeword(eb + (EB_HEADSIZE + compr_offset)); + if ((method == STORED) &&