From patchwork Mon Nov 11 18:29: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: 179099 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7021636ilf; Mon, 11 Nov 2019 10:30:38 -0800 (PST) X-Google-Smtp-Source: APXvYqymu3xj0SiL/TT35ZXAlWEiSvX/iGfL4PRfKxFOIpYFW8mrg8c5iObhpuybv/N0hqvlwyCS X-Received: by 2002:a63:712:: with SMTP id 18mr20011224pgh.384.1573497038261; Mon, 11 Nov 2019 10:30:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497038; cv=none; d=google.com; s=arc-20160816; b=aN6miMyOPcLIWr8aAh6ORSjZElOWfK/LOCmY4JIyuVyo3AgfocMbd+TSIdlMNdExfu FHE8QSjCQqGg2v98yz0pFfBFyufdR2ubtQDLSo8LZaYmrIDvQB+8WsUny0l7NFaEi9eI qP8caYKu4/rGZYY0IG88DJB0bm5YLylSE48OdHUHhtYWF8UjS7MrENWzOeD1vPWOnoPP DranaFVPGo1WsjVzWUd+fSuQux4EnV/i+mCX32pgQteDVdVrSH4tc1JgJq9Tg6l3iMea adYksPc2Cs4n+dSJc+hWENI7ALArna281myb9Yl+0z2BECkT/aGJsgABmgnoaC/9wOd8 skfg== 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=HPKDPV/HZkG4TIJKQ1rYxb8rLxc1jVAm7OI+aGMyMho=; b=oj3r+8LpP7I4dl6moF95iJXoX3Fl7WniBRMDWgJ/Kba9znTvM4DfXN7ZuKcsquMeBQ DPJ94qjooghWh77u5gKiG8GzTjFwVQlyAXZFBEd9TBbtUWJRKKNLAK1QpCYUG1jc3eyX YjUv3BBOK0ZGQnDulrknpxA3fkBtCGlBHX/jUyXrveNMlh7L8JBXwSO0UCqyOO6+DtKy LDOiCMxaRifEedsKkJnsbAfyoIJb8OgJaY6u0y2gUR7AcgbBYx+2u42yaxF9fOC34FYV TSFE6CIqxNFjAEX4fgU49iHTDfeuggCC2Wg0q6zWGtRD09uHWpkPRlDaArFc/L5zeQSe SnHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZIIQbb+6; 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 ck13si227698pjb.90.2019.11.11.10.30.37; Mon, 11 Nov 2019 10:30:38 -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=@gmail.com header.s=20161025 header.b=ZIIQbb+6; 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 22CC87FC0C; Mon, 11 Nov 2019 18:30:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mail.openembedded.org (Postfix) with ESMTP id D78AA7FA48 for ; Mon, 11 Nov 2019 18:30:10 +0000 (UTC) Received: by mail-pl1-f173.google.com with SMTP id o9so8121011plk.6 for ; Mon, 11 Nov 2019 10:30:12 -0800 (PST) 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=Veb47STQy06JyrRpRrtcJzVXh/pb7PA3d6emSS2vUrE=; b=ZIIQbb+64vb2wQrZYvcjTy/9pUB6jctLAWcPE7Gs5EGt5p3917A2LXgKIXQ1ToXkA3 6PaS1Y/Ndn1jwZbq+tHx0YBJAbcQrkwaSmKIW7fKP1HfkjfvDi1rNG0el56Hnf0tEWSs MYxh3kf6y8FJ4DskzXapv1+/m8fEBWq1SUg7p2MNdjMAZBAbqHBCC/8SDeAEVFgSIO2M mn7n2wrxOvoIDjwcVWGTUO2iK+D/5jDOrbKuiMSCb+7BQ6MIS4XVUOS6BdC/wKoogfEo A2G1+aabXDim4w+lsLNiegAhzeY2umu1gVJ2RVy1AT3LLq213SYXZ+rC4RvdoCOib+U6 mOFw== 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=Veb47STQy06JyrRpRrtcJzVXh/pb7PA3d6emSS2vUrE=; b=tQg2Hfw6MAK0CS7/luyTGYsNWYDmVt/HjeSiZ2Ku94nFEre/wiAE3qguKcNGB8OUto RPI6nWRadI4vZlDPS6oY+U6uqj83GlP6UZs0CwDRGFyqpJe+VDwSDbxr0qyOZEe+z1wQ JF80CFvHjJY/eObAhlY3asDnl5i1nBLjqTyhrsRf5xiTnzsiTSt1e+CobAs2PEq3eVLC Kt4DPB0pTTbOgoJxy0Xd1uvBi/7FrbUD9kodHXYVOkMMOfmrZBOgj+3Xr1YdkTr3DMWy 8CUU1gFn5Z19mChWRZTkQ4mqBBonQpy/5lXd4DZarhHPXegzGgiG9UTM33oOFm4G1Ptn FjVA== X-Gm-Message-State: APjAAAVx4xJ4Zxq2ERFkE5kJUPwOSvJD99L+gpsYczlDT/73G5QQ3TU/ gtHt1c17oJHp6euMdltc0EPMyhxi X-Received: by 2002:a17:902:b702:: with SMTP id d2mr716984pls.104.1573497010723; Mon, 11 Nov 2019 10:30:10 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:10 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:44 -0800 Message-Id: <2435c38e109cac68476ee672eca09b4cd6237ed4.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 02/21] 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../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.7.4 -- _______________________________________________ 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 0000000..3d02c5a --- /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 6547d12..509b6ce 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" From patchwork Mon Nov 11 18:29: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: 179107 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7024107ilf; Mon, 11 Nov 2019 10:32:32 -0800 (PST) X-Google-Smtp-Source: APXvYqxyIgvCNGpdDRUGCnPuEVJMxaGJDYSGv1fTrAm3U+zxhmklYJWHxJw/Z4uEiATvUhS5YnSx X-Received: by 2002:a65:6482:: with SMTP id e2mr29817864pgv.20.1573497030422; Mon, 11 Nov 2019 10:30:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497030; cv=none; d=google.com; s=arc-20160816; b=CY3cD5nkxOTJSbf6uFBPKCK4EXlORi0UZcJJNXNQXSzECiv7lpGjx/PLfkJcy4cKwN oAK0eNb0EXq+AjdAPA34z200vMudkS6Jtu40EN+YPE5f3zOoHR4zmvxxxrVFaV9//o4+ lWkuOE0W1+SQUMMeW1IsbtmbD3TRK0z6Jh44JSVl9RRlfC1h+ZG+5ztLt/FSQNSZwepN N2d1s2koUZigOdFWw3uJL8oK0RZXMSM2Kpw+KAmlCsx4Gy358HFJIk167DAUDvEa7rtV 1ImXkKP/TCu9EzTsLnOLPGHwKmBCb/VPV7mTyUQPkMm+OgPSy+cFnp9LInCeeI9mooHn 7yug== 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=5WYgrVJlPvUSrLwYsCghtJgnaA5LSCXcWCO4PAzcaAo=; b=rBkj8VJqidi6wDGRiNwCbz+0uetSFhtRObx37ZArqYhjGbFgl4khD1z7bOwL9ivajP Bc9eQqadnO2VBb3DczIM9ZtSoGy5KigjifkYiXkM4qZHlI3tbm4sn1vyJnOaH0SZrQM7 xKkqQSqPeTBzu9J9mqKFi3rQjhhmrbH5VpCRzD610j1H+gtRhA46u8X73oNGrjJIxWtQ RIVQdiu096LLlCVXrhP9RHxJvUx1+iUhGLosHO0Ps/x7CYr268MwgjWtH7JkGzMRo3lJ 0LY+pGqeuxjxSo7NkqrVlCtQ4aM+zMJysAinozpe05T3Pb1N5Sh1rXwj0bTNDnTSEuDN W1jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Ott2IbK+; 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 h18si5113644pgg.259.2019.11.11.10.30.30; Mon, 11 Nov 2019 10:30:30 -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=@gmail.com header.s=20161025 header.b=Ott2IbK+; 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 D691E7FBCD; Mon, 11 Nov 2019 18:30:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mail.openembedded.org (Postfix) with ESMTP id 9C0477FA48 for ; Mon, 11 Nov 2019 18:30:10 +0000 (UTC) Received: by mail-pl1-f169.google.com with SMTP id l4so8097425plt.13 for ; Mon, 11 Nov 2019 10:30:12 -0800 (PST) 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=Xpw+6a7b+ZWsOQ4dSSMnGDtZIuvfEaSDqkxaL1fT29o=; b=Ott2IbK+3ZJg0dl4bhaPjKJpavRxa1bTHzRnS6K+bR1nYN9FknLTTgYCQdQnW5EVgl C0m0VRFyxyutg5C3Uk5e64Tr23KtIi4AcTsYaoHaGL0cdKNMS/CnglFyLq2Oiw49yuXk 8Z7GnO3Ueez0uxts6UKXnrropKOQASYJ/WzzqamwlX5Y4+wuIHahaoJ476KQYLLcxfWF +1OwxyzjHeKpHePs4PTShIF1hbYPPpdSmKd0Tn1IgNPV4LBX+oSXcuIKG76tWs2kDYo/ tk6Rx0dGXMxLFEdbI/+dXzqNgBEx42tEUiYdS+PkkrZrUx4wABodHLTjmD3IGiIvBjRi r2LQ== 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=Xpw+6a7b+ZWsOQ4dSSMnGDtZIuvfEaSDqkxaL1fT29o=; b=E0we5L+nMHCsfIwEJEK9BcWUVggAFHjTEGl88jQrGqUBvFXuD96mNUvLwWvEyxqrcE ZJRy2O/1yLFxWA0+wgyQ8heod77OlZL8HJ2JqOaszDzpfgMHoV+imEtDMWt5jRIuwIsh e4Z3SP7xACdVPkxZgPuE3ewdcKsacA1gso55hriDFsqnanHAT8+f2cBmoYju00UDiC5T puux32tMToIYwNYs3htMf0Wk9jMtwx+Xr4djo6KxmjwCNCsNanqM4f6/fuAKWY7ZoSzr KbKjvi247cLyhpcndyFv84aBCi1yE78K5W14q+vowurzHOfqoPHE4VMHADpoB0DKKsKF F2fw== X-Gm-Message-State: APjAAAW1KRHzfq5WTlQ72rmkhg3wMIg2Nl+2xmtbi0kRIj2vt1C9yupW Z7M8L3gX+V600djYpBWLdtBAgBFG X-Received: by 2002:a17:902:758a:: with SMTP id j10mr28194254pll.29.1573497011575; Mon, 11 Nov 2019 10:30:11 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:11 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:45 -0800 Message-Id: <4668ac8c2600fe5698f030ed1e8cba69c0989a2c.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 03/21] file: run test suite when building natively 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 As we apply the same patches to native and target builds of file, we can verify that the patches are not breaking by executing the test suite during the build of file-native. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-devtools/file/file_5.37.bb | 4 ++++ 1 file changed, 4 insertions(+) -- 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-devtools/file/file_5.37.bb b/meta/recipes-devtools/file/file_5.37.bb index 509b6ce..60fc661 100644 --- a/meta/recipes-devtools/file/file_5.37.bb +++ b/meta/recipes-devtools/file/file_5.37.bb @@ -32,6 +32,10 @@ EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/ FILES_${PN} += "${datadir}/misc/*.mgc" +do_compile_append_class-native() { + oe_runmake check +} + do_install_append_class-native() { create_cmdline_wrapper ${D}/${bindir}/file \ --magic-file ${datadir}/misc/magic.mgc From patchwork Mon Nov 11 18:29:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179100 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7022313ilf; Mon, 11 Nov 2019 10:31:08 -0800 (PST) X-Google-Smtp-Source: APXvYqypboLKiI4cbvx4CwEUwoalcgpCV4uSvnhfNXNwbqFcQgFIc7yyF6wukb0iUy/NN263qWtN X-Received: by 2002:a63:2c3:: with SMTP id 186mr30374702pgc.166.1573497068248; Mon, 11 Nov 2019 10:31:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497068; cv=none; d=google.com; s=arc-20160816; b=iXG1ewIaPx7nkijaguwzwvWtftxdbpQHmtrxfGvxZhWoamoguAkvNmgVHoH6xgyB+J 6+2hs+gUwLN/EBV8cyNteDPfeSp3/ldTUjr0uCNxmBE9WiqZ7xXPx5jCmVKPuSuyTrH2 rse+j5y2jv1A8rXTe3hdJpVrJ5ZlZ3um2UUfFFzZTEX3LTq15ssqXMbM4WYuE7brdiVV t2WBDqFockl9L4C+PVwtwLA2L/gwGKEfiN3UnAKBlMfynLArvfIuRKDsSqfVb3Jnr6HB lGq4F3htJ0OQHe54uP/ZOBVr+6pWJEB11zsfJF+x+oiDiWDnqsRp/ASx0YQbxVSzuqcq +XDQ== 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=sFmp+NnBwFwaH82SckXjW+8XOuUhzCmIsAGn92S2ZJU=; b=KMUx6/T+yiQGvuWkPQqoo3FNi+C5JNKoPOVKHMtDBJPqiE0ctz/CMzhEP1mm3n2LVo tBc8HyZ9Wvp+Iqp5Cu9iD7Xq/256ja6EtfzJWox5bGSTXWjmN/0JBRsIiq0zpsgxeYP3 Xdpg1Jtdkty1Q3+GSS8QyXoLYrAA26oTc22Trn8lsybqiu+EvCsAVEbpEkl60OHwtiEL C4qhVY7No9mqPOb/UaOVAIT9LWUVhy+0wYLfgdGWaMVJ4W4lyEkJBv3rKILiFpRj2Zo0 dwHh+RDjfyJREGhvSCdpKp8CHk7WEUkb5VX4NtPJdlfaDCOUHH0DIkFlVBtaZmjoa0IO hsyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aeWlzGir; 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 t15si17297431plo.71.2019.11.11.10.31.07; Mon, 11 Nov 2019 10:31:08 -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=@gmail.com header.s=20161025 header.b=aeWlzGir; 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 F3C2D7FC38; Mon, 11 Nov 2019 18:30:28 +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 6FE237FA88 for ; Mon, 11 Nov 2019 18:30:14 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id p24so11232752pfn.4 for ; Mon, 11 Nov 2019 10:30:15 -0800 (PST) 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=MTPlbdV2kzNVJ0uYniwmPagNs43B4KG0ZEqQNd7r3mQ=; b=aeWlzGirFbhlc88pfwyNzvlYVTDkxoGsyHh4Tx+HZWPP3HmSVoOuQuIkmdCiFTT57e D0aNrizRYL+H+2AvsjV/4Lb7M9fNN9CBku6XZjMXN//l91GRNaiJpx+bZAiaa1Y9lRc5 h0r8gEoarx6dr36RyS9z40Atb25DnOl3jNuThkEwLK2z+PFM03Ox0YVXilcPH44ZQTny wxo9ScH9w+UcMD3n2O/qj9F/uhcilYr91w/yrXMolTOpwTiiPHONPGztqVae3pu6KNsK VdIKovlsJSV2gIKoUBUv3B1iPk/NokKjljUGyeUltAMT+m7LjECVRQ+XFAuQTv5H2HFY MolQ== 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=MTPlbdV2kzNVJ0uYniwmPagNs43B4KG0ZEqQNd7r3mQ=; b=GWweqUf6wG4+5EVgVzBkdZArUg52MRjlrvRQFg3CGnwHwISOPqNw2t6iFBaaxyJ68l NqYBIPUMqSLQRNfRiFXTmFbV4QZKiZaHLSr2h4BFrT9nnZ9RnOTVlwXIg3zwNfDlJcRy 5Re3iBnPZ1FW+0O6Z7hFbhdeUHWaQCoUeTkzB6gAuzsrWuzPx0Vr6wRQCKzq7TnTj3b6 0gobeHTV3f2hfg8R0cucgXri/Moi+xaBTq7XF5p4lT/lHg2y4oMiFAKM/zKnJipqHzHa kyfopNcfFBFFsoOznBax9iF2f6uSWUsfsfVVh3Cp5UBgGmmVYk21jqUcE+zw3vV2I+Ao 3uGg== X-Gm-Message-State: APjAAAXbyKF1BlbiGaPXG4Gn6T7pVf509ktyiQvAVyIq776aGkcDM4hd SViDpJkUONbpjhxnLqmlDMgs8vW5 X-Received: by 2002:a63:cf4a:: with SMTP id b10mr29206687pgj.86.1573497015270; Mon, 11 Nov 2019 10:30:15 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:14 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:49 -0800 Message-Id: <29d926802e7f8b4614a2dafa0af4c923912e1811.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 07/21] cve-check: ensure all known CVEs are in the report 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 CVEs that are whitelisted or were not vulnerable when there are version comparisons were not included in the report, so alter the logic to ensure that all relevant CVEs are in the report for completeness. Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- meta/classes/cve-check.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index c00d291..f87bcc9 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -208,12 +208,14 @@ def check_cves(d, patched_cves): if cve in cve_whitelist: bb.note("%s-%s has been whitelisted for %s" % (product, pv, cve)) + # TODO: this should be in the report as 'whitelisted' + patched_cves.add(cve) elif cve in patched_cves: bb.note("%s has been patched" % (cve)) else: to_append = False if (operator_start == '=' and pv == version_start): - cves_unpatched.append(cve) + to_append = True else: if operator_start: try: @@ -243,8 +245,11 @@ def check_cves(d, patched_cves): to_append = to_append_start or to_append_end if to_append: + bb.note("%s-%s is vulnerable to %s" % (product, pv, cve)) cves_unpatched.append(cve) - bb.debug(2, "%s-%s is not patched for %s" % (product, pv, cve)) + else: + bb.note("%s-%s is not vulnerable to %s" % (product, pv, cve)) + patched_cves.add(cve) conn.close() return (list(patched_cves), cves_unpatched) From patchwork Mon Nov 11 18:29:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179101 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7022476ilf; Mon, 11 Nov 2019 10:31:15 -0800 (PST) X-Google-Smtp-Source: APXvYqyCBKEEUAOP7UFFwiYsPfIJOR9x8BYVg7Pmog0kUOXtT7bfj+WYCn7lh1f46RdAjzKmTBAo X-Received: by 2002:a17:902:ab93:: with SMTP id f19mr6046238plr.187.1573497075717; Mon, 11 Nov 2019 10:31:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497075; cv=none; d=google.com; s=arc-20160816; b=PPvWJjQz9ufn43G5KmVyrZRktFZYgrrCx0PGvYwespTTtGH7hpeaoUrN92CYGL10lW Rqhp2sqkA8+NuoNg/TKkHqDephjtRpswMYHl9kfylgDMmXccf4Jfhur6NQXpz63D4+BY 2M6GUwpota6zBf+12gT6JfjCoVAzS6CaQO5awMIn4yvWJGDG6+XhzsRlvVd2C5gU1/Zw ClTMI8P9WyISR1pNMwAujHJs3x2I5vvd0YbuCVJpqwhbvsbuj0EBQhXLeQATWXY8YQjL 1JUFzKwSFParByBGahHCuekyiHvUuc/WNKegtohESrxAtAA/LbpllIh7iZAV7b1jkCyH KnHg== 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=e04O6wFPlUItok/yYD84rmYiaZoin9fyY08CwTmn+e4=; b=oCeFw5c7LVU+d0BrSxstT4OJzmqodBzhu1gvsUpb4WHXZIyCnBxwyWBuF2sJ+3j1kO DzVRu5rinHjjZGQOKRjj4zRXc7nUrWPqxFChqzvSRoIWj/Ox19Ew/5pfC/D3Xk3OGQto sHG6ebcixHeQCJX5yVvAJZam48Mc1wev88ITWyx+4Y+4HfQbQKJ1l7TKBqj80E1ADSBJ 4P6u9yvzbeCjtC7dh3b5cw2VRbyo/yh+McI1GGsQ0suLIL19LON+AeP/2EYEQPCs5+Yo yoY/hYeUevSADnCBkYGZiJtiQTW3KijiFKwgYwcePVe5JUbszJiltnC4BPgoXYGyjoLb 5UAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CP9VBG0z; 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 t23si18170935pgv.203.2019.11.11.10.31.15; Mon, 11 Nov 2019 10:31:15 -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=@gmail.com header.s=20161025 header.b=CP9VBG0z; 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 1E9DF7FBF9; Mon, 11 Nov 2019 18:30:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mail.openembedded.org (Postfix) with ESMTP id 226FC7FA88 for ; Mon, 11 Nov 2019 18:30:15 +0000 (UTC) Received: by mail-pf1-f175.google.com with SMTP id 193so11181124pfc.13 for ; Mon, 11 Nov 2019 10:30:16 -0800 (PST) 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=p2qippAzDsbEGIrVESDCMqqabAka+K1mq2+mJYLx3l4=; b=CP9VBG0zkwKx0XovDnuP1HLpljiOeeyBn6RAwqqbSZdiEkNo5RQnB1xTtCoZ/ZUbnS 8VROh2Lrdba17JzRQrKvUc+h9ZOmEYOZ2KjPrzcXZ7tgkBDIRaec1l1ybY1iD6NvB1z6 +LpUQSfCyIExcsl4NgEupeh7BO6z9BMdt5JfI2relhIdrkOf9Mzr4hDj3ej9OuaGYAVA /OelNCT3kmFjbhX2+igTUFQgvl4McVzL+EhTa+bcl2ILwixFRuM0Yt13D6XoBc1mY51M l8q+ekDUtP8rHd4oYeyzdQi6k/Tn+std4+fHbEmtLwEzTKUxjehY5qDTxrXoDF6IlAG2 eF7A== 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=p2qippAzDsbEGIrVESDCMqqabAka+K1mq2+mJYLx3l4=; b=HyrZpCd4IKhDXWiOw1n0aWTE82p99ZUAjDNRoLXA4B2/qjQIbhczHsIyVJmsEVZNS/ 54QekrgUHu38W0rzNccPjvtx5KaI5JPfFNFc0qmrnzsbyqnibKAqlTuFgsyKV3DynoGf gMLdaL9f6bE8C96vWJ+RGxW2sCp7jWDucrVeC4f2uW6o7lNXCNkyOKUxDM+synURWT8B QXvCsKyL5AlzleChh8asAq+SxzODT7oLcyCq75txe2UceiBRs/vvjDeKbJjoJYJFSxbV nmiririuIMr0kZm1Sucl5GlHGHKfwjuHch+QUbR4Btzv+O7seZuvBHFVJKeQiIT/gFok Qv+w== X-Gm-Message-State: APjAAAXWR9QzHSjLAEiH9Et2ZTAzRSpponk7DJkBOnV38daUcaT17UNS NKbLvfDApleFOBlXcdtdhd4AXmcw X-Received: by 2002:a63:ec4b:: with SMTP id r11mr29951590pgj.147.1573497016181; Mon, 11 Nov 2019 10:30:16 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:15 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:50 -0800 Message-Id: <7ae318fb4eaa8595c30af68c9df0d6c09116dc4d.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 08/21] qemu-helper-native: add missing option to getopt() call 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 Noticed by -Wall. Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- meta/recipes-devtools/qemu/qemu-helper/tunctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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-devtools/qemu/qemu-helper/tunctl.c b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c index 16e24a2..fc00e99 100644 --- a/meta/recipes-devtools/qemu/qemu-helper/tunctl.c +++ b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) int tap_fd, opt, delete = 0, brief = 0; char *tun = "", *file = "/dev/net/tun", *name = argv[0], *end; - while((opt = getopt(argc, argv, "bd:f:t:u:g:")) > 0){ + while((opt = getopt(argc, argv, "bd:f:t:u:g:h")) > 0){ switch(opt) { case 'b': brief = 1; From patchwork Mon Nov 11 18:29:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179102 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7022613ilf; Mon, 11 Nov 2019 10:31:23 -0800 (PST) X-Google-Smtp-Source: APXvYqwq6G26IVMvDyonWnYiRrOSSwfh6GV64lHKLFW6N4QrSo8/2/JkWCh+juJoOzd3XDw6O08C X-Received: by 2002:a17:902:6b0a:: with SMTP id o10mr20388719plk.15.1573497082878; Mon, 11 Nov 2019 10:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497082; cv=none; d=google.com; s=arc-20160816; b=TeNkSzxc1QCXPyP5vteabTtXu0BQ+cjsUMtxO54rNkivdTNNC+tLI9YjeO1kyihkTF V3s5aUktnLiY4mqznycbdmHciyNDLdTYtsGFcUln15tV7mzsx2+FjGvhQCgWz9wKbqLS ZbwTvRYz+Wz46hxDqw2iNx5Ya/6GNYJNXs+axaXbPxjoHJdexuqyAzz2c0C/JLRURjM7 EmapBNTArL30OSLM50Am4RkT4QvjbRj4UZ4bFiUY5DQEosWzoXvEkHCbjiD907L0lJ36 uEfKD0D/qG5eme3BagG8HuZ+xv/AhTV9qfcVervq4nxEr8CeZfP2sZCm99+zj6vnPs0v XPFw== 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=WkOyWvDZXtUpDjz0zSX7KMaEDWkhd8gWadnPsA7ncaI=; b=MXrfyusNThRljHRTKvhGQ03wSo2JYUudgJJVa72yYcbpJ2SA2HMeGB2W5KVW2F6YiM CA7dOyrWf2OkgBWWepG3QwcOR1DrNeX4o1CmNz49c/twhweCqrFhmsVNGvs77AJuZxN5 m6is4eFDBvRs4g0g6K4m8LFuxGWPagbZKWAZ9u9v/ow9WcsHCVPbdQxSHge0qYXkO0Hb SlXDUq7W1x+yblXjtCLaHEygGZijn7uPlpiwQkylKV5HVcoYVll2uIGBnfcgjyWnoY3K XjqibfGwXXQfyP63D475DeIYLLMEPdKUX/+AU2hVwCN1Jy37Ij6Q9RCrM5fRHHafBzfS ATlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cE4nsdwh; 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 20si18418744pge.331.2019.11.11.10.31.22; Mon, 11 Nov 2019 10:31:22 -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=@gmail.com header.s=20161025 header.b=cE4nsdwh; 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 4086E7FC4A; Mon, 11 Nov 2019 18:30:31 +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 8BD157FAB6 for ; Mon, 11 Nov 2019 18:30:16 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id z24so9961518pgu.4 for ; Mon, 11 Nov 2019 10:30:17 -0800 (PST) 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=6rb/J/AEYQhuTLPYkxMkPGBjGOBNYO33YGlscNFOcyc=; b=cE4nsdwhlfUuH2cLo3c2NOzRTrBVSPl5SB7+pa+Qaa6VLAKRFPxR8QPYzfheK4Mg+N MGHbn0Yz3BcD0FjRPzjrEFQSz7OFGQP4nb9C32B+arrNH+sdyUbpSp5qHG2iQ+XjhlhC JQcd+2qXCCHuQPwBMECrMVrHMDzJj+SmK1s1iHslqFNH9W5XNvPKOiLyZWdj2RkZViz5 eEhrfFGC5zZSkvd+STCuMlTGu4CsIyY+yK2Q2OFriAjEDWiX093NlmmdYGX2PaaplEeS XcMP8xJnsgY/vZi1ocysn9WwSL/PDsDfzwnwQjvTD666b1xhFZhYrG0qpE6DitMLiS9c jVYg== 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=6rb/J/AEYQhuTLPYkxMkPGBjGOBNYO33YGlscNFOcyc=; b=Tp783rQEnBvFLx4IwnKeudxAjxhTxzQFmQw7YBQ/745UySH+9pzBgvuWESbMVJuXYV 9yr/SevuO0F8Mrpz+jT9Edm4tlDzRbJl1RneO/w0uTLE8jFBpR+6Z6PP6iajA83q2cTr UTr4+KdObQSU2YWc3TzxwqGdK+CglseFFJ9r6tPWhcq8MMD095rpIsRRJSOx+ooQYgUU Io0eTswILwtCtDQiyTjrYZeOcz6Rjlu9BXxhoKMWbv/IMpG1M1DyN/nvgtv/1CQXca6L ZLF8qLfGhfSzvzgGDZoeEyVuUqZ6gSOdfvPmtydNThOaf69HT6ERcL5jMqFYM9vwazEI NhYA== X-Gm-Message-State: APjAAAUNude0r+fuXPbwveCHY3EPxKY47MsHR1H1+3+xTHeZQJZYvxH8 dQoLJOozIM27S2X/k5czePyE3Fr2 X-Received: by 2002:a17:90a:1782:: with SMTP id q2mr489874pja.57.1573497017249; Mon, 11 Nov 2019 10:30:17 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:16 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:51 -0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 09/21] qemu-helper-native: showing help shouldn't be an error 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 Displaying a help message if help was requested isn't an error. Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- meta/recipes-devtools/qemu/qemu-helper/tunctl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 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-devtools/qemu/qemu-helper/tunctl.c b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c index fc00e99..d745dd0 100644 --- a/meta/recipes-devtools/qemu/qemu-helper/tunctl.c +++ b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c @@ -19,7 +19,7 @@ #define TUNSETGROUP _IOW('T', 206, int) #endif -static void Usage(char *name) +static void Usage(char *name, int status) { fprintf(stderr, "Create: %s [-b] [-u owner] [-g group] [-t device-name] " "[-f tun-clone-device]\n", name); @@ -28,7 +28,7 @@ static void Usage(char *name) fprintf(stderr, "The default tun clone device is /dev/net/tun - some systems" " use\n/dev/misc/net/tun instead\n\n"); fprintf(stderr, "-b will result in brief output (just the device name)\n"); - exit(1); + exit(status); } int main(int argc, char **argv) @@ -63,7 +63,7 @@ int main(int argc, char **argv) if(*end != '\0'){ fprintf(stderr, "'%s' is neither a username nor a numeric uid.\n", optarg); - Usage(name); + Usage(name, 1); } break; case 'g': @@ -76,7 +76,7 @@ int main(int argc, char **argv) if(*end != '\0'){ fprintf(stderr, "'%s' is neither a groupname nor a numeric group.\n", optarg); - Usage(name); + Usage(name, 1); } break; @@ -84,8 +84,10 @@ int main(int argc, char **argv) tun = optarg; break; case 'h': + Usage(name, 0); + break; default: - Usage(name); + Usage(name, 1); } } @@ -93,7 +95,7 @@ int main(int argc, char **argv) argc -= optind; if(argc > 0) - Usage(name); + Usage(name, 1); if((tap_fd = open(file, O_RDWR)) < 0){ fprintf(stderr, "Failed to open '%s' : ", file); From patchwork Mon Nov 11 18:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179103 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7022750ilf; Mon, 11 Nov 2019 10:31:29 -0800 (PST) X-Google-Smtp-Source: APXvYqz6etoIpdsNaXIltSvhAYTVhhg9rH/hKSlxCN0kpbhHTUvUw3I7ENh2u8bLV6Mm0WeHxRJl X-Received: by 2002:a17:90a:c982:: with SMTP id w2mr462789pjt.125.1573497089707; Mon, 11 Nov 2019 10:31:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497089; cv=none; d=google.com; s=arc-20160816; b=XLrUCE9Vm1qN9rZA1jSTbi4gztn0s0yMEs/3hFKgswBbLHAxjzd4T5sG3fRuDrl19F cLrZGK3Uh+eswjf4Jgu3+8539FIDfwFDjHM9jxmoKJWj3FZHZeZZjSZeHOXpK33gu1HK WvOEPO46Sa8uRioZWgD1gC4I9FToKweaYp+vAflswBQWrda0v3+2m5Zc6P2E9B7WougF TL4FueburPopkweSUsRGfRNR8ErIiZOdGcLN3si0sLLeq6QhgpB8g6NJg+8VlgStK3mJ 0/khzHGA4+dp5hVTSGRBmVvk4jJNwTYKuQ/sY88erCIvkvLBGixuFdnn5nUjm6JH/3Uf rPlQ== 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=iNHkvw629unKhPJkmosONP31kOjGNebVKD9pVQ18ENs=; b=fWm3Dz/lIxVb3lllPcco2Zs4vBaMkDFnQbIFknu3FL9dJKJ3wvqGwB51Nyc6jwmK1C 4cUgwrI22HABswCeCiImiqUC2LA/+rwlNMUTLcpkzoocaiCmLJ7W1xy+kW+43QYZATog 87Z7piV72k6dlbF4QDjheKwX95Lp8QWzzAGpd52sI9ywmTrNWw4O1SuHqhh77nSAMdCD 3BxC6321yLJGWdpqlg6aGyIRguAOfv+x3EsuH1xy8bGLr8IlZXwN5SgPMpZkWG3FqVvb BOXHspsJ2qTW31ITa91yoiNd9QzokC2bWxyesGVj63+edbiSnTlNhdzFCdTT6Q5/EPF+ BLBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tH3aHLs7; 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 h15si11121047plk.185.2019.11.11.10.31.29; Mon, 11 Nov 2019 10:31:29 -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=@gmail.com header.s=20161025 header.b=tH3aHLs7; 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 6A3F77FC57; Mon, 11 Nov 2019 18:30:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mail.openembedded.org (Postfix) with ESMTP id 80C9A7FAA3 for ; Mon, 11 Nov 2019 18:30:17 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id r18so9916462pgu.13 for ; Mon, 11 Nov 2019 10:30:18 -0800 (PST) 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=32EZqbdwQr21NXzJlqZNdwpehsrvsihsInbOWtYAYiI=; b=tH3aHLs7UR4mszxIQmJ7J7fJtl5Z6eZnNf1cJIxtgPRmtPxFpgEJLIXUt1QxkQ8z1u 5dy2N8K6pRWqnI8tyZ3pD/85uFsYR0WsAI7Ghvvo+9xg13tpAXJ3Q8nW1J6b70I8+1Iq hemNccOqlm3YOyzCw01CBpZuziVySqhvJni4vyqWLsXXdOIaSGh5Gfy8+1dNSiztWocW YlSaLlkTmwIVp/MArQKXiviaqmIU1CSF3MuTYRBSKe/Yfz6YM+y7CU/sAuTy6OYh/xlc EwsiybKqUhlbPIzkCSh6JJ4L6lsf7u+6CUq5H6IOzfbLZ425IpPpst2U7bGpYYoG5uhe z/tg== 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=32EZqbdwQr21NXzJlqZNdwpehsrvsihsInbOWtYAYiI=; b=Q2mYDFnjtCjUbd0Wuk6RKiXipPgCqnvt2IvUxm1BbP03xeMbgUxT1xB7ws9oWyPf5B /SKtAvohirq6vADDmgIkLkfqyW1wNTcnl2ak/n06OaeQUjG2Bq+2xblBVJQzxTEF4HNi IcTlakuJp8IadjmWCnQCBxQahczJBN/1IdPevG69+mtOwKfVRnY9oaw06X58xrrivipS 39phXYZkUb4nMkDJY2Lpkx+j8ZZvv/1+EKKbaw3Olz4T1YVUo3uHynl4laEOS1P1uaEK Uca7s3udeUfyKjwJoNv5Vs5F93qOykbEi7J2PG2mtSOgepD7W3c/rgxTBxc3is7vHaOX RVFA== X-Gm-Message-State: APjAAAWK+xwZV1wrWnyFnHV3IfF3AH7wHIHNKOBC3b0EhrkBn15iHIp8 NB2CLqUZ+E9emnJUZ6QWxi9TSHzD X-Received: by 2002:a17:90b:30d7:: with SMTP id hi23mr566319pjb.10.1573497018505; Mon, 11 Nov 2019 10:30:18 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:17 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:52 -0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 10/21] qemu-helper-native: pass compiler flags 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 Pass all of the compiler and linker flags so the build is correctly configured. Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index d9d9da0..372eebd 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}" inherit native do_compile() { - ${CC} tunctl.c -o tunctl + ${CC} ${CFLAGS} ${LDFLAGS} -Wall tunctl.c -o tunctl } do_install() { From patchwork Mon Nov 11 18:29:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179104 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7023107ilf; Mon, 11 Nov 2019 10:31:46 -0800 (PST) X-Google-Smtp-Source: APXvYqxsw4PqXBmsBCSnWJuRCNj7c+tsIgpLBo9l87tyFxGzX/QJ5fh48fs+gttRpHU8kyhRxwlk X-Received: by 2002:a63:1f09:: with SMTP id f9mr29241618pgf.89.1573497106440; Mon, 11 Nov 2019 10:31:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497106; cv=none; d=google.com; s=arc-20160816; b=sgXRxDo0ujxUwpZ/SuDEG2FuwHoLy87MyAIGkXHwnfRaHFbLbpb46MWdiMesgaHgAu 78Sr/BNZ1uwoOeo9mp4ZG8ssDAdqjfjPApeMZcVf3ATEYGnulIAuU7aRzn7RgFU3aDDr fOsvK5IuHlwxl/wKweQBptQeVTVTvJPftHaUn7ymxdU83S/betydDTvkrpqkb6aQTjcC yWgLWnsRc8K0BpfKwhkT4dU/s0AQLErKMmG16oK5hamcjdTCZaMpmFTcofDf0f8va2GN 7mDVomLRBsmMN9DB2dQKOEXqjdCHSaCKrHgYdTbUXvsctHIr2xyO4lBYzyPSd45QVAi0 KiHw== 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=OpTBkkKQSw+afigI2hL2aFHFby9oD/H75t3H0ih3oDs=; b=t9SlXchbtPrJPUajgTKyHSDiUmW83Fv7DY/GTFl0OYx/Jb2KPFzU8t3IUuUSE3DnOZ oKRsvjf2OhsKP2Q0qeNejUP8qFW3xM66eplbtWYqJ1Ogl1brPFhwBKxk12iwGbkxqf1c 3mTvia5aEv//BwIX35pNqM3NCL/jWKnV0bH/OyHQ/JMEkRDAy8iyhS67zd/EE4xBg9jn BH88GqVDr9PCAmRVbOCauBu+HmAqBlR+2+RKaD3/uUQe01jr+fC5jzu0iZgQXNCTWoRF VfN3Rs3mlrMe5I1Pw7TJVTF04KVOjgNlo4BO7QOy1mQeeDa4SZUcEnyYw5J2puTAEv2k xdQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C6YikR3l; 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 3si17999963ple.154.2019.11.11.10.31.46; Mon, 11 Nov 2019 10:31:46 -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=@gmail.com header.s=20161025 header.b=C6YikR3l; 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 6DB7B7FC4F; Mon, 11 Nov 2019 18:30:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id 7DA2E7FAA3 for ; Mon, 11 Nov 2019 18:30:20 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id n13so11253834pff.1 for ; Mon, 11 Nov 2019 10:30:21 -0800 (PST) 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=duxQDG8OK/jynCSpyBfTGHs7wKcqkXYCfCD9PLM05Gk=; b=C6YikR3lDgReV4Npw1u0tzI78bLlcukTa1W3UHx1Ue1OPodaQj3CfyQNFLV8XJ5SFZ PB+B8ft1fSMSvUvrmV+3H9/8WN6UV20v25CbTdwH6VD43Iaedd/+enh5/IRwbLwOi1hr +un/QA6PjRxRAEa0saAoUEN0NL4ouGofeKl7tqYnShQq5yxB8Ka6IEjuBU6hWznzYMTP G4c1WbTPI92f5n7CHnYRuL4B2/yPAp1spr81qMwZTw51hdid0lovyetGY+DEJCKakGuZ wBwqIIEtxyXso0w/KpJIdyELiCZmkye7GuBHJlKcT5nDmeAr3ulcCYxubanqX1T+BB7+ uz/Q== 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=duxQDG8OK/jynCSpyBfTGHs7wKcqkXYCfCD9PLM05Gk=; b=eT4sYc0lBgae/fhwY9BCaFC+z8aeyJHfLh8O5gICvxMGfx57vAJU49fpOy9Q38D7z6 8J8E7H6kzX/95jQr9F+w1iZJAH9Ij4F3Th6+DbrtwIOStPcJRsz2g6oIxFCNYAW27TFN 0CRRIOdXiJKwhZxwfsli3SdMdr86Lbq/ie09gG6t93GUHuaEkl3T/Zh+mVR3i0aZXz5O irOth6DCfFXscGEPdFYVvpBxnfQYiObjjn2LXLgJBv/uSrHHga7y+lqtWqz5ojas5c8a U0p7m5w5lRue6Lx3mP2EHm3zQcPppKcgGKhJl/6j4tMrgzv/KgWGCYOKOehi48V8+VEo OAnw== X-Gm-Message-State: APjAAAXBMWQ2Sw1gru0zRqRwrHcMIRpw4O16S5GEFq0edIW4LEzWnf3Z r2rMMYcTQbpwE9vY09MgwLF4KfiP X-Received: by 2002:aa7:96f3:: with SMTP id i19mr32101634pfq.173.1573497021545; Mon, 11 Nov 2019 10:30:21 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:21 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:55 -0800 Message-Id: <6b5cadd1a5822641285946f7e2ad56e294658621.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 13/21] cve-check: failure to parse versions should be more visible 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 Signed-off-by: Armin Kuster --- meta/classes/cve-check.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index f87bcc9..1c8b222 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -222,7 +222,7 @@ def check_cves(d, patched_cves): to_append_start = (operator_start == '>=' and LooseVersion(pv) >= LooseVersion(version_start)) to_append_start |= (operator_start == '>' and LooseVersion(pv) > LooseVersion(version_start)) except: - bb.note("%s: Failed to compare %s %s %s for %s" % + bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_start, version_start, cve)) to_append_start = False else: @@ -233,7 +233,7 @@ def check_cves(d, patched_cves): to_append_end = (operator_end == '<=' and LooseVersion(pv) <= LooseVersion(version_end)) to_append_end |= (operator_end == '<' and LooseVersion(pv) < LooseVersion(version_end)) except: - bb.note("%s: Failed to compare %s %s %s for %s" % + bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_end, version_end, cve)) to_append_end = False else: From patchwork Mon Nov 11 18:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179105 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7023613ilf; Mon, 11 Nov 2019 10:32:10 -0800 (PST) X-Google-Smtp-Source: APXvYqxvyNcyaaUjjmuXj2Q/UMW13dTmoX+MpSbcYcyRoq+JG84p+TeTC9k8dMEsKOeAfrId70Bn X-Received: by 2002:a65:4085:: with SMTP id t5mr12103060pgp.335.1573497130680; Mon, 11 Nov 2019 10:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497130; cv=none; d=google.com; s=arc-20160816; b=zdAVL1OjyuVci6c8dmLwW/MlZRfNqpJEpRrbo3QFaszOsMAG/4IMc1Y1cpV7ikW5EC sZ7OSW4bydQ4XMBnLDKqY1wx/l334LW+fy26guO3UnppAiRslbwEUnzaB2yc3WbBzquG xsYKjUqQ/nEjkU5EYlb/nfRBaJFYOa6q9s2yAvC3lXM5gjghaMqT+Ts4mZj+RYw47DuG i1rweFzbDaWTBMRW9J23npR7mJG/lVpYtj1nWRfCWsXWwskUpnHF6PAHmrazgKm2wmAY aO4MaiyFr9hJDVDIlD9IxhllJEbXlLFtLOiv/zkijeR6qOy+2AFiZdXsheeo1qO7PvGb D/Mg== 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=XeXSTNDd7L/X4Ym5amfFWtGAGTZ2dtIj4s74DlSZ8os=; b=JFDLORW6q73aOCCu5cnk579JDW5TBMTWwkOtPWeuwSTavYlIiI3bdCMg+i71unoS1H 37qp55v9r/w75FXD2YSDjhJCcNgOIOD0m6aSd/6OD8/AIW9/qYSDydr+y3GVPKjYy0Rl p0+RXHUqBkU8uO/t+TdWg89g2dycZKmZiwBXW5fHAD28maQl6s5Q2/u6xsYiLh7gGra7 EpvwSzMgZ16KhiHnqacFmeTkT4v4uw3UYNs1AoI4VBYrfKdsDcdU1Jgl9jJ5LzLqNfYa Ma3UbzZvqFP4iKLDTiFx2zkr7lnEnCn4HVSpc9UxIjKpDhLTmAK8sysR/h/3VXYDzMu7 cMiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DVPunNJO; 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 k12si19054611pgn.594.2019.11.11.10.32.10; Mon, 11 Nov 2019 10:32:10 -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=@gmail.com header.s=20161025 header.b=DVPunNJO; 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 65B547FC8E; Mon, 11 Nov 2019 18:30:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mail.openembedded.org (Postfix) with ESMTP id F04877FA42 for ; Mon, 11 Nov 2019 18:30:22 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id l24so9937968pgh.10 for ; Mon, 11 Nov 2019 10:30:24 -0800 (PST) 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=LoEUb3vUWCMmigr1IqaKYvMkxWUlPNNCuwa8gUUKmwA=; b=DVPunNJOhHLo5sxuiLxzxkNudmRWix7+iZ2pDWQHWsXfb3/thvpU0ivE0+bwJmR3dM pn7BYbEudmMUMLKvh2R/6OVDoqG0EIuAQQtum2l/ZO4JwevetPdxqLNWTPAOM1KebiQz 7/4opkaFg5EQTy04NGwbz0JnNOHDddDETR6XeVTYMppPJtqXUEi5c9SznZD2DZ1zZfqd 5QNWGZ98JpUmJC6MviJnf77vMZd8CHOSzjOJ0KqDkcbOz8FsQBhzpvp059uESPn9RLiL d8Rj72iiPPJAW+0XMan+xUJRBf1+oQicmthh9DW+o4Gzk0uNRT/8C+lD2JAHuiKJavVw y4NQ== 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=LoEUb3vUWCMmigr1IqaKYvMkxWUlPNNCuwa8gUUKmwA=; b=EqlIelIW2cNVUTYIipe4rYk9JiTtpfBZezeN9GyxWQezZ31A+N8UBsRHJFIeIP36Tx 5xobepqrNLrUjRcD5OmGHXw7GouiGvvYzr7s+sE2AtxSk+3FqAPT5r6sum9yyKeUgLCZ xLuUATM/y/JLLYvAEjKYfblzQNk4+VUDKFPJjkE13k9PAfA4W1rgEpuv2aYivgtNNc78 bVSVOl/R/H15LgmDEIn1fXMj1u23ewPMoAYkR7wvpuJB7mgG6S3edlYS3/UzZhGnDdPd ZfkO/R82oEWlJPT1vxo0rd8QUEAtJFHWeXgSL+FS5kR/nGnBfdLlWkUKTWit/08YCEeA ybPg== X-Gm-Message-State: APjAAAWVYNraxScAUmk0GFD20/84AsbvwE8O5g7E3i8dvVFRfonNkPEf zUmC+1LZhCUxfrcvdGjzq8tP6xzL X-Received: by 2002:a17:90a:353:: with SMTP id 19mr551337pjf.128.1573497023417; Mon, 11 Nov 2019 10:30:23 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:22 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:57 -0800 Message-Id: <90b4b7dd19526e8aba79cf469dcc2c05401f36cc.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 15/21] recipeutils-test: use a small dependency in the dummy recipe 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 recipeutils-test has virtual/libx11 as a DEPENDS, but this will cause errors if the recipe is built in an environment without x11 in DISTRO_FEATURES. This dependency isn't actually used for anything so we could remove it, but to save updating the test cases too just swap virtual/libx11 for zlib. [ YOCTO #13611 ] Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 7c20d9a..0cd0494 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -4,7 +4,7 @@ require recipeutils-test.inc LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" -DEPENDS += "virtual/libx11" +DEPENDS += "zlib" BBCLASSEXTEND = "native nativesdk" From patchwork Mon Nov 11 18:29:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 179106 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7023819ilf; Mon, 11 Nov 2019 10:32:18 -0800 (PST) X-Google-Smtp-Source: APXvYqzb1sUxCMh9mGxy/3mT1UBnO3DfXUMfJ/iDUsHf9/ggG05CEMv3Gw0hqA5JwiNqXHCdXTLs X-Received: by 2002:a17:90a:7bcc:: with SMTP id d12mr492127pjl.63.1573497138171; Mon, 11 Nov 2019 10:32:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497138; cv=none; d=google.com; s=arc-20160816; b=EpbtDIeM1j1QP1Fle1O006+hf8mzgj9AGb6CfFrH6B45lVHbOu4Va4M7mz1mzNb1Kh mAl65O+VaeWjnIUJnTO9cSfyEWdrAIMCY0Ara5H4rlHCM9qnx1qw6vpMV5jsB4qiaYGc j7tpK1N5xcDLcARZ7d9HpRrKHRhtfX7SkpeRBCZLq2QjIHF1v1pNHjAAR3cDVNKjmg9V jG36OSNaUqLKq3YzTI7gAI2zaIO7WbG+7WLEF0b60BY+Xpbw2WX8xxuNpYXdpO9aYBQV x/SSFzCnj1HQ94Ragea2o86imcqIldmFVdD/8KwmOPLeiuJhl9bzpOvY7JIoZxWHRekX ppow== 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=T8Vw/TGg+YVlWmbXkyXqy+0yYVUNA4xWSV5+6i6gHq8=; b=1De71e4PgjEIIdYMs31TMQxmtMDaZkpVPHIqlw2ejfC5LCE4l97pAnvB42G/gYXedE ouyr5Zpyb4WcxJMA/O/Aq1qHpoU35F7u8n2Iz8Lw7jc8Eq6lw/v/5XvsNwSXtemQ6pE3 grEryuZPVZusvPNOsZomMz331BsnJrQVNxbuCgS8RdpvepGiP4UW2WnIHsQXv/HccaLm SSBSs2xtKlPBeeyDBx5cnpiHRnwRFu5p02GkFMnlfpOX4TY9RgRhxA6vS6t5ekYSbdx5 ShPN1Eg7d+HReBJZElE7XpNPezv8t3ocmULD7uJZl4QZraUfDm6RQU2RkWzILRR79mge /hQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HFguDZmh; 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 a128si19798519pfb.173.2019.11.11.10.32.17; Mon, 11 Nov 2019 10:32:18 -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=@gmail.com header.s=20161025 header.b=HFguDZmh; 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 8F3C37FC09; Mon, 11 Nov 2019 18:30:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by mail.openembedded.org (Postfix) with ESMTP id 9489B7FA45 for ; Mon, 11 Nov 2019 18:30:23 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id 15so9945702pgt.7 for ; Mon, 11 Nov 2019 10:30:25 -0800 (PST) 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=UnB+qFtf7XRTf1acXkY+pelryarBLz4L3x6kJa6PSfw=; b=HFguDZmhdxpSxuKvKHnLH7F78p6HOJgtzI5TVdNd1hj5xy+ZTBjKsAJVr1C5V7+W4i YhzjTmykLSrK3chYifC8C8866oyFnkHNX/dKBkTqhoZjrYfiIBLV91h/YQE8i0ho1IUI UVCmeXir+vy4hfmNrFIhVafCp4fhOPRJ67AfM3xj+H7u9KPTGR6Jhj1dZFZUbSJrpneD BHZa9wsj0vYV6aI+gpE+BQwKJnd0D3Gp0qONfRfmq4jeZj3zHJVlrDUpQX37jv368DBN oEep832O5H72X6IA12b7vies9/GBrS+/18J61Hv1hWh04CwZfkIXRIuv/OJt1i8FFNs1 1LJA== 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=UnB+qFtf7XRTf1acXkY+pelryarBLz4L3x6kJa6PSfw=; b=Pu+/Q8p5zpVbHxOw7sxjdM8h6RCETTq8vrRcLNatFNGfx7rEq4qYsDw1bNvFWCCe55 04VMa9bg7W6vADQl/gnKHXsE9fAAB81Ee5TEsiySR0jIRlTlX4G4IQFX+knILYAyBTES FLcPSg4qRdWqNsUsh7AY9CQh3Zf8uMWyLNfRZF8vXKm22SEptRzNCPhAMzjaq592CF2R tDK/e8aWBt89qDPVTFMD7Tq0GmrssVAIjzLH0urH+J4xUOFn+XZAGNGy+IK1fas/Tsfd U6RUNPkQBOrSSKQbii8PoTjvdokd4zO+/4pWWwcetnQqpol00nHIiE1NBukDDYWVbnhw vZcA== X-Gm-Message-State: APjAAAVGPXJBo1IUO/UN2VnW2LmD5yD9O7R5xJoON+vBEPYCu1Yh3eRa pj7hJl0Sjeq1+9aTW4X1zC7k/IPH X-Received: by 2002:aa7:9157:: with SMTP id 23mr31573974pfi.73.1573497024070; Mon, 11 Nov 2019 10:30:24 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:604a:b703:29ca:5c7d]) by smtp.gmail.com with ESMTPSA id l62sm17731698pgl.24.2019.11.11.10.30.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Nov 2019 10:30:23 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 11 Nov 2019 10:29:58 -0800 Message-Id: <41b1d53cea0302f1c3954c6ab048366c908cf754.1573496794.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [zeus 16/21] patch: the CVE-2019-13638 fix also handles CVE-2018-20969 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 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-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch b/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch index f60dfe8..d13d419 100644 --- a/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch +++ b/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch @@ -6,8 +6,8 @@ Subject: [PATCH] Invoke ed directly instead of using the shell * src/pch.c (do_ed_script): Invoke ed directly instead of using a shell command to avoid quoting vulnerabilities. -CVE: CVE-2019-13638 -Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0] +CVE: CVE-2019-13638 CVE-2018-20969 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/patch.git/patch/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0] Signed-off-by: Trevor Gamblin ---