From patchwork Mon Nov 4 12:14:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 178395 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp1399170ilf; Mon, 4 Nov 2019 04:15:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwVr6BFRL2Dmws8QjXzxOv9yIHJ7UvG8we/+JwLnHkppbLf/nNr/PpvEi2PWmBBLOM4KJCE X-Received: by 2002:a63:6a86:: with SMTP id f128mr29446124pgc.295.1572869706801; Mon, 04 Nov 2019 04:15:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572869706; cv=none; d=google.com; s=arc-20160816; b=my3L1lhJHyZ6xtq6EqS1RXEyijzvpA0XYUcfLmaNEZdsCx8FNYC08py0SwK80m/OyA u7kXn5SyEnGp3Zy2fUddL01g7BGvl52wsCvl5sHOYzQ0Ejk875KJBxs+h1ojAwdaGo57 Nq/uJVGMk2iHLCA8IOcjBbf/z2XiYUQjs8Jk1o0ouSH91kLKgR59NyfA4nndR+wMZjco xlPHuUhtVsIFIQyYzRWQWFlhweYdJIDyH8nc6EfEkChL4BI4sJDKYrbStuGouPmQ2VJj 72lbeIOb8Xl2CUSzScorT9u2SS4crHmnJCs4sf5DuygnZue5spC2xOw1wDqJ2bIXqUOg nidw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=Z+C4dBYQwWpQOUQHPDlGJEzXUbh5/2FqkpHixYvLa2I=; b=kVz/v/WY68X0a0+3KOrTUo231ItsjE2vhuUEVeLlS59C4qKaJ0VKrGM7+HVWyXYBni tAj14cZSAZxMTfwbOLmuONdEmbY/jMpuS9ZiYAJUvrWUBZFUliPR7alewlXRpfwsBPoU 3ne08DSiHCkuNlXnmAblr3TUURIgF8mZB2yS8Es0GYH69Pu1rHL6L6h6tRJHfbqKSipG TBBMSkiInL6tc0p4wK+kV+mshzvH08INJ/e7Dd06BtjF4bAX4eloTrywDxXHs3M3Ebo4 IsEEMirKLbQ9nTGADg7UVyFKd0/zoQGfE6Rx46ovGE6Zr7ctwwTb4iJzawwIAgAbzlDX PVXw== 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=eShnGJdW; 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 w18si23669177pfq.257.2019.11.04.04.15.06; Mon, 04 Nov 2019 04:15:06 -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=eShnGJdW; 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 25F487F89C; Mon, 4 Nov 2019 12:15:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id B53196D230 for ; Mon, 4 Nov 2019 12:15:00 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id o28so16775555wro.7 for ; Mon, 04 Nov 2019 04:15:01 -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:mime-version :content-transfer-encoding; bh=TUmzuLbnw6MoCIFsxoOaEDqA/oDpCGpSwYcjtLHBsNk=; b=eShnGJdWbS/sQUtUKYZOi29pnGdqSgLtP8rdAikkRwOywQv45cvU8ngsO80V+tKtVD VTAn0rB9ltyMWinEavjtwHezlQw24tyJFMWASlvGZNdcvXYDObf3zCbc2RRfmmKPAMrZ DfFl6HGoQGebckIhR225hf9ybY3RAd2MWGg67HCAqBlDLPh/tvKpItaFFdRa1GJMgDJz sphnBDlVEYsd+nNvdr6T2CBKB918nIdVrXOb57xKXG+B18pw29/PIoOo1UY3m92nJFKN OlpP+1ofwgk4INYuoi45rc1r28nwWzSKcWTNz20dmDa7S+ADX+6UJlJUwITNq6/pcL/4 eKSQ== 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:mime-version :content-transfer-encoding; bh=TUmzuLbnw6MoCIFsxoOaEDqA/oDpCGpSwYcjtLHBsNk=; b=p2ieU+XNOWN/g3EasRvLd3A53vSh5n9augObwBnaeZq05GZD7hemNCP0Ll+UqiCQgO iwQ0pDAxPazMabF45PRdBI5VYTKp/5OvA5o9XyATactoIM5qRsApFVRL6TNjFzWtocDv CXBdhkV+Qf/t+SRo6nwwjh1oIrEBPjJmTACoacKD/fQFMzu5H0wOqT0rNx3WncHqQpFo ZoiiwlWfIXWAq/wgiIaKnPbFFkP8ysr3FLobYVAhcfhGRhIvQM5Lr4U3h2lv1hp4OQKb gWkbCHV13F/3sw6WtN6q6fPx80rD+Cj7du2CbUgbvxre2QbyPVY7f3q/56DH1C4Ibcrf Bocw== X-Gm-Message-State: APjAAAV4UxShGXVceV9ug55piX83yTAsVov/4ZcI34M8Zqf08c9nU3MA JhwrQ6edJ31aEJcnUeh6Xz3X6BnFukk= X-Received: by 2002:adf:e805:: with SMTP id o5mr24706902wrm.223.1572869700895; Mon, 04 Nov 2019 04:15:00 -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 b3sm15388077wma.13.2019.11.04.04.14.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 04:15:00 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 4 Nov 2019 12:14:55 +0000 Message-Id: <20191104121457.22123-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/3] file: fix CVE-2019-18218 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Ross Burton --- .../file/file/CVE-2019-18218.patch | 55 +++++++++++++++++++ meta/recipes-devtools/file/file_5.37.bb | 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/file/file/CVE-2019-18218.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/file/file/CVE-2019-18218.patch b/meta/recipes-devtools/file/file/CVE-2019-18218.patch new file mode 100644 index 00000000000..3d02c5ad4b1 --- /dev/null +++ b/meta/recipes-devtools/file/file/CVE-2019-18218.patch @@ -0,0 +1,55 @@ +cdf_read_property_info in cdf.c in file through 5.37 does not restrict the +number of CDF_VECTOR elements, which allows a heap-based buffer overflow (4-byte +out-of-bounds write). + +CVE: CVE-2019-18218 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 46a8443f76cec4b41ec736eca396984c74664f84 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 26 Aug 2019 14:31:39 +0000 +Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz) + +--- + src/cdf.c | 9 ++++----- + src/cdf.h | 1 + + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cdf.c b/src/cdf.c +index 9d6396742..bb81d6374 100644 +--- a/src/cdf.c ++++ b/src/cdf.c +@@ -1016,8 +1016,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + } + nelements = CDF_GETUINT32(q, 1); +- if (nelements == 0) { +- DPRINTF(("CDF_VECTOR with nelements == 0\n")); ++ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { ++ DPRINTF(("CDF_VECTOR with nelements == %" ++ SIZE_T_FORMAT "u\n", nelements)); + goto out; + } + slen = 2; +@@ -1060,8 +1061,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + inp += nelem; + } +- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", +- nelements)); + for (j = 0; j < nelements && i < sh.sh_properties; + j++, i++) + { +diff --git a/src/cdf.h b/src/cdf.h +index 2f7e554b7..05056668f 100644 +--- a/src/cdf.h ++++ b/src/cdf.h +@@ -48,6 +48,7 @@ + typedef int32_t cdf_secid_t; + + #define CDF_LOOP_LIMIT 10000 ++#define CDF_ELEMENT_LIMIT 100000 + + #define CDF_SECID_NULL 0 + #define CDF_SECID_FREE -1 diff --git a/meta/recipes-devtools/file/file_5.37.bb b/meta/recipes-devtools/file/file_5.37.bb index c53a120b840..71801f9d479 100644 --- a/meta/recipes-devtools/file/file_5.37.bb +++ b/meta/recipes-devtools/file/file_5.37.bb @@ -14,7 +14,8 @@ DEPENDS_class-native = "zlib-native" # Blacklist a bogus tag in upstream check UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" -SRC_URI = "git://github.com/file/file.git" +SRC_URI = "git://github.com/file/file.git \ + file://CVE-2019-18218.patch" SRCREV = "a0d5b0e4e9f97d74a9911e95cedd579852e25398" S = "${WORKDIR}/git"