From patchwork Thu Jul 26 23:01:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 143002 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp133122ljj; Thu, 26 Jul 2018 16:01:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcKIzrowAzTb7qmo5xaVJlJA3dOHXykADP/h0SZMRlP6lPrL45Z3f3mI4+skO5Phm3HmL8h X-Received: by 2002:a63:9802:: with SMTP id q2-v6mr3672967pgd.70.1532646099306; Thu, 26 Jul 2018 16:01:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532646099; cv=none; d=google.com; s=arc-20160816; b=n6wk7XqfvgMX/qHRit4hgOb5+vCAs8QdUgyu63KpCGKGLKQe8MJ6jrlj/Y2T7RaoPV hgGsNGVvAjp5WnreamlTai8UcNQLxg1LdTZNKkzY/3C/d8oqvnxt0u8ijnPt28aahqHZ s2czlP9CKKFoNdvD5Ga/kgDds+XEf3opTLOKOOQIU7g6soFAVV7mrs/14xmkNlHjpQwN Imx7zbu6VTAkEMattqRRPslhHbhrmWpXT19Ag3BtY5PoN2IRUjjer4dGqA8tVfnMjagc Ffpe/3//oyZSxyUFIhT7EovtylZnXTjvX7oayFmLtCIGs0TaS6afcdOGXN5euY/lzGW8 gxYg== 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=7S6Izl8zlxw/bXxZG92aNvZhhqAnkdL0LLCrkd7z5/E=; b=vpaZf8l7DbTgNzSrIqpndBSHemQMvhScLFHa/bz/jK0nvCfWB339+4Op7y/WgkzKU6 7W/ykPk5Vt2PuQuz6AoO6SpVGKKrPrF5xPidwOATczhAk3joAloA4EI9WjEWTzeyZ9aY vDF71v4goFaYbTerRcIHqn91yvFsPaX9D7lSlqOv61MtjvqTvdXO8BAIQ/FKYHeyHWWS 56Q5gwuwqwm55/EI5jMiFaIaUAwwpfWBkPj2V0ofQDknNQNjyWhQpPo/eb1prGF8kR7H P98CJyHvr+g+6r/OIGiMRREpVK9GvvaOq8AxxSdY2GTfPz1hIQdHkINDJ37laJMdUAu7 R2QQ== 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=uV6qaE7m; 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 h189-v6si2202730pge.66.2018.07.26.16.01.39; Thu, 26 Jul 2018 16:01:39 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uV6qaE7m; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4365C78C94; Thu, 26 Jul 2018 23:01:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mail.openembedded.org (Postfix) with ESMTP id D6AD778C59 for ; Thu, 26 Jul 2018 23:01:10 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id h15-v6so3231504wrs.7 for ; Thu, 26 Jul 2018 16:01:12 -0700 (PDT) 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=Q9x2j5h00tIxOYpax3r0mxin0zXOEoHtXVPcOjOUKQo=; b=uV6qaE7m+m25Pr4KWlQb2LJ6QIGdLeuebg1TM+zOF+/KMsHczz7y2GWPtEh2m9BzGD 54SUR4AMecwhvzl0xgp0c0akizFyPB1bD4Zlbq0zNPomr3DX+t618EJRaO/I0iGV8YeT KNY5kuMXOMouZ0BBTZkfBOX5F7Axdvrh+ocEDebvxfwxkBezWlKOpfg6qhEDjgCEQ8fu I26808I3unUQHMvNFji+6633xc+pVEN3Ek6AmJTtHOtORKjpxObknPKme1tK+25NSu3g s8fuE0t5MNGWFiQ/44ydyAXolL92ttOjG/dpGYeOvRA3IB7tQC1JnZN28JP03ZltBOQb qv9Q== 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=Q9x2j5h00tIxOYpax3r0mxin0zXOEoHtXVPcOjOUKQo=; b=P3isDeGJoyKZjrmFTFMUI6soJybPR5Qsg51N+O1K6PICtmqD+1iiozIk02TvUD9+JV FxCAimLUG4ghKbhSropm6h61ydgTRutx+QRZhCa8LbvR4fG6trM2rJgnMRoXaMDBIiNM SNGw4srF5q8KraYDwAfeV1y3dXFQKaYjo1yLKVVY12FrG7hzSbCvGWRIHGUowVCTPjwk H5sVrO/0mOFjqC4sp687Ge5WIqgzvJVvM7tiCNcCBVD/DvuJB/FxxrRG/XMej++uv50J 4TSqr81fr/48XN68IyFipBtfjhChc3LrhrkesHKZxgBBwgBfrUZrFke8LHma1Ul1ZT+4 vRMA== X-Gm-Message-State: AOUpUlFe54qxJqkoDG5oXJ6Iuet2XFJ/tef9SEHhjyFEmmPNM3gtupNU U3ZdMjfI4jk9cHD8wHf0+v546PZvJ6k= X-Received: by 2002:adf:ad38:: with SMTP id p53-v6mr3022186wrc.10.1532646071038; Thu, 26 Jul 2018 16:01:11 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h7-v6sm1948532wmb.48.2018.07.26.16.01.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 16:01:10 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jul 2018 00:01:00 +0100 Message-Id: <20180726230100.6629-5-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180726230100.6629-1-ross.burton@intel.com> References: <20180726230100.6629-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 5/5] unzip: fix symlink problem 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 --- meta/recipes-extended/unzip/unzip/symlink.patch | 26 +++++++++++++++++++++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/symlink.patch -- 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/symlink.patch b/meta/recipes-extended/unzip/unzip/symlink.patch new file mode 100644 index 00000000000..a38f6f16123 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/symlink.patch @@ -0,0 +1,26 @@ +Unzip doesn't handle large zip files well and crashes: + +"This only happens if you have more then 16k entries and when one of +the 16k entry infos is reused it happend to be previously used for +a symlink entry." + +This patch is taken from Fedora (https://bugzilla.redhat.com/show_bug.cgi?id=972427) + +Upstream-Status: Pending (upstream is dead) +Signed-off-by: Ross Burton + +--- unzip60/process.c.sav 2013-06-09 12:08:57.070392264 +0200 ++++ unzip60/process.c 2013-06-09 12:10:08.641696988 +0200 +@@ -1751,6 +1751,12 @@ + = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); + #endif + ++#ifdef SYMLINKS ++ /* Initialize the symlink flag, may be set by the platform-specific ++ mapattr function. */ ++ G.pInfo->symlink = 0; ++#endif ++ + return PK_COOL; + + } /* end function process_cdir_file_hdr() */ diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index 105d048f55b..dbf4112a4c6 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://fix-security-format.patch \ file://18-cve-2014-9913-unzip-buffer-overflow.patch \ file://19-cve-2016-9844-zipinfo-buffer-overflow.patch \ + file://symlink.patch \ " UPSTREAM_VERSION_UNKNOWN = "1"