From patchwork Tue Sep 24 02:48:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 174243 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3584178ill; Mon, 23 Sep 2019 19:50:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNs5mEioWUA5MQQJnP+yX4BzhoIsxPB3GSw1pOmp/SNR6nYIzGa4HOwmzHWHO7GZhTThtG X-Received: by 2002:a62:18d6:: with SMTP id 205mr757017pfy.90.1569293420021; Mon, 23 Sep 2019 19:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569293420; cv=none; d=google.com; s=arc-20160816; b=oggRIfMFA1OA+rKex1d4S/Ulyp0L7klaS37Dg0YM0wZdRkMuCUzmCvRw2tky7qLdOJ bDZlk9vj7ZgRY2JImmIzCKkmbCCgOGhfjrxSrroCSGQ03MHBpy/8V4x/y/6oavFyZlVJ VeRv1Z2f1lowhAOFhCpGioGNqNnzjTJ604DYRcbY0SWCixk1+EW0wEtu1I1s3T25c96g LPLlcLd6IIJV/cTmLM03iSv9p/Rx856AB5PVYFozr15SlDj9d8UnwTUhYmJsyvxfbXp+ EbwMPC+d2Rt3dC5PzGsK35TtmBjGc6OPKwQpfEj8PAr7wXUNVTkvIYeHElzVgTt6SEeL jucQ== 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=K+96q/3v4nv+uCw8l4wMbDdxybsEghDjQ39WlnqLAmo=; b=dcmTUcL8WkoaNL7kcE2uG3z9vRH8XPxE7TDxftlsOWCdQJlkcg8Ywf7GB+zL6+RVm2 R/0pUdxhwdDAB7jotc4U+xoh2WHYfQTDL8mCFqCBDIIbZEQV90drbb+jn3o/VTXrF2qK FGAX3BmsGk3IH3wGL+h2pilJx/h0E3nZLIIKa5XG2ffYb03fAMU/vswimCmOdPUoG6c3 WjHvdHmOoxJf/6+SKnS/HJKx88wdbb2SbqCDoNcEak7ciH5UCQRpxiwrC+jwbbGf9/8I 9cf3v9SzUiea4IS87lx8J+HQQrrn9xgSUshseZUjC6XAdplRxSvHEjzCcXLDa0ARwj1o Z7RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cokXe9Rm; 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 u28si392959pgk.378.2019.09.23.19.50.19; Mon, 23 Sep 2019 19:50:20 -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=@gmail.com header.s=20161025 header.b=cokXe9Rm; 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 642397E721; Tue, 24 Sep 2019 02:49:44 +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 DA2117E26B for ; Tue, 24 Sep 2019 02:49:38 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id q10so296481pfl.0 for ; Mon, 23 Sep 2019 19:49:40 -0700 (PDT) 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=dQOskvLO4+Pm/JYq2/qiTkf+C0DW09nZSD+JVJDcubw=; b=cokXe9RmtJcTdIzS0+wlIYrg51NZsFu7o51qB4WehPP6Fv3r9QC7Wfvc1czwcRwSxC pHrK5xYgTR81R1Rn/ak9+FlqDx4sxQq7bLz//ND3mJkNjS05Ys6qrhDzsGljI+L+tumL uimfiEgGXbIa9ILmpexlP/+5Ijn9sHsQxt4dAXPAIKmG/tkvnapVzhXa4rJ8hYufX75l pFnWOHQvkoACKF5YYuwTu5L8Zve+hUKzDhKpmI+IRM8LLpGrE152JfMMSGuoA8gHiCLx IT2K16/dH1dbam7qjFaMF5a2ua0lFIjLIPc/VVru865rw+8MYyi8myGSr4sZXNOKseyx m8Yg== 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=dQOskvLO4+Pm/JYq2/qiTkf+C0DW09nZSD+JVJDcubw=; b=VmdCSxO0rhIQJq7XjspKZxnpSF1fp8pD6MmApYTQgvZxYe4Sp4s53SrHYYYO6+9RoS gHM/pw0t2UaMtQc1qIdizXoItlqeh6cmoQZl+jOubo/I1T1a2R3iDY2p5zKPfu5DMRcg LjlSUNtNHPt4hI6YQYmBlih1i0qW3fvY5WucRe/pXAuD5EI1j+cwUp/LMPB8XjTKBWZl FfF4nuKYd32jtmsHHCUyvMBuqNt1hNwoH13GxKQ04nHBWz2PmuJGCSsyWKNwZwd1sFLu vPP4Pr/yXNUZ1ZsXf+ddIA/JfTy+Pr+gsR+O3b3ppqYkCrf8CR74jCORD1VJqC+ZMOTR WkRQ== X-Gm-Message-State: APjAAAV7Z4IZ/Cf+FPHDr+1sHyqH5YCjShWa8lqIHyM4rwmBZVY7YGWd JgBf1bKffTeHyKocwjW4hgDzPGEzaYA= X-Received: by 2002:a63:2216:: with SMTP id i22mr783577pgi.430.1569293379857; Mon, 23 Sep 2019 19:49:39 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:ec07:55c0:9c8c:b3de]) by smtp.gmail.com with ESMTPSA id q204sm146791pfc.11.2019.09.23.19.49.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Sep 2019 19:49:39 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 23 Sep 2019 19:48:46 -0700 Message-Id: <027618ebbac58a05da0cfd27be113195341f3588.1569292053.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior][ 06/50] libid3tag: handle unknown encodings (CVE-2017-11550) 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: 5090afc1b07e62f70ebcf63a7abb75b8552f0a52) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libid3tag/libid3tag/unknown-encoding.patch | 39 ++++++++++++++++++++++ .../libid3tag/libid3tag_0.15.1b.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.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-multimedia/libid3tag/libid3tag/unknown-encoding.patch b/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch new file mode 100644 index 0000000..f0867b5 --- /dev/null +++ b/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch @@ -0,0 +1,39 @@ +In case of an unknown/invalid encoding, id3_parse_string() will +return NULL, but the return value wasn't checked resulting +in segfault in id3_ucs4_length(). This is the only place +the return value wasn't checked. + +Patch taken from Debian: +https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/ + +CVE: CVE-2017-11550 +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf +--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 +@@ -236,6 +236,10 @@ + + encoding = id3_parse_uint(&data, 1); + string = id3_parse_string(&data, end - data, encoding, 0); ++ if (!string) ++ { ++ continue; ++ } + + if (id3_ucs4_length(string) < 4) { + free(string); +diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c +--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 +@@ -165,6 +165,9 @@ + case ID3_FIELD_TEXTENCODING_UTF_8: + ucs4 = id3_utf8_deserialize(ptr, length); + break; ++ default: ++ /* FIXME: Unknown encoding! Print warning? */ ++ return NULL; + } + + if (ucs4 && !full) { diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index 43edd3f..0312a61 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \ file://obsolete_automake_macros.patch \ file://0001-Fix-gperf-3.1-incompatibility.patch \ file://10_utf16.patch \ + file://unknown-encoding.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/" UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P.*)/$" From patchwork Tue Sep 24 02:48:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 174244 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3584271ill; Mon, 23 Sep 2019 19:50:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4TeJ4Wvz+vq0CKDwY3x7sgUHk4CK3R48TZR+lz9SdXXrtK9n2xYRMToerwIA9eq5Mk481 X-Received: by 2002:a62:5884:: with SMTP id m126mr686018pfb.169.1569293428684; Mon, 23 Sep 2019 19:50:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569293428; cv=none; d=google.com; s=arc-20160816; b=nq4MvR2h7MEVNkEltNiXwScksqpOt0uOdqrHsNWLqFt2AM/lxuXTnmt/Vc+/qgO0mm 5BE+2xmBXguUIJb43wjkD22ug34LJEkU1tnNu3gnYVXXBTeR7/pesgIAil5sjh+m0T4t BV0NjqbeysVUtgJKq87pJYVuxq3WNuUzJFOzBXcaFziMBTx7BbotZfI2m7n8tRwci0b/ BwENOyMYtUWy4UR91J7wjEBa3DPleUrEJc//6E1HLfe0u7HRGbVz+KRYDY4AZz6iGVhS ZCyafeVwy4pTCx6RTEyxE+tj/CAp4Cu7UooVsL8wkz9A0NejDUEmD04BX37o9mB8Raz4 6NNg== 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=aw/kiuQuw8PHySoV4AVgBQQGcyNQI2dfE18pzDOGe4w=; b=Tlk0cFoqa5ooGKMqfs5qzEjr0ozKbNFR7USEHN3wshJLwHINv3H3T0gxa8P3usQkJ0 qE9ZwO0cpVTY4bVshc7Jiwh6MnPeubxdMOObeiLs8FKU6jKG60cCq9zSEY4l9Ou06R8C pTw0zmr1hDgm1IS0mZ38d2vs0H/azMI+tKxdZkANGYnj3l9h7XNkkwl6kF4GTwY/2n0E 3MoeT3dgsvPpHrIhqqnjE8J5me+/gbMMWzDA9roRFCqH9zzr7atMAhQwKVYKQQkczO+a GwJMcvieyAKQhWTN7XI+kUpJEWCZvjl8LpEEfhc8j4y2f2cmZ8OCGU+oi6l3NBY3Fibr bOEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=V1PJwbFV; 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 ba10si477308plb.14.2019.09.23.19.50.28; Mon, 23 Sep 2019 19:50:28 -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=@gmail.com header.s=20161025 header.b=V1PJwbFV; 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 A0AA07E5F9; Tue, 24 Sep 2019 02:49:47 +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 13F0E7E713 for ; Tue, 24 Sep 2019 02:49:39 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id q21so259369pfn.11 for ; Mon, 23 Sep 2019 19:49:41 -0700 (PDT) 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=nUH7MkGfM3M2BiD7pDQVoBZUwXRw47CBguDNEuVxBTA=; b=V1PJwbFVBb9CCKvCHBC4DYQUq+XfIdXA3FmaYhYmMzvcvmZuXBVGGNQ/e3toPEV03j HPHjthPmbykuseVOZrh6Y16MDBntJYxd7MfbyKqQnCI6U4CdKTp0ZLyDQQq0RRokVfgD BiSmFddq/qBAISLFxwQUH5kz5dxQsAmNtj9zu6NF/GvSf9xhsnD2P8Tz/VnFPsRUHXEj Hz1RkOvbIJork5BHuJqfLeVY79pSRWXTu7TuUCVIfwoqyP48Uv0V91AQ3tV6OT6lFA33 Xp1Cq9FqylXDkKGhg2DQZRIUm5ydj8/L1H0KPP7IDyJgTTvzlyckg4GE1Ko9VOxrNZet D+HQ== 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=nUH7MkGfM3M2BiD7pDQVoBZUwXRw47CBguDNEuVxBTA=; b=peJg99cDlgkA3ox5oHN8hNaFi3KB/sP8VPTW3a/AAz+KTlmFkIBu3KcHvAIp9aLSvG CVtCuiQStQXOrwhnisuZuzQUmfFMQ+YJxXNYmHdEhtBqf8O4NsWn7kyb8TQK1kG28nA4 DY++OGOd6gBUMm1bMgQAEOrMO1u4uauRuIj7hCUGVNIyP66cQ3XoLa+DdghlA+6EieWm S6Bbjk3QF2fqPST2XoRWu26IMTFducKDXNFL9jwEM1mikZZVmmt/ClgjvlgQZfkjawti M+Tf+gOujNvCS7b60nWC90QiZGYLXqdJJyGB2S2E719V9ZAI+69ZdivUTYuG385Jin9S bjAw== X-Gm-Message-State: APjAAAXRlSMRfjgufSimpJ7y/gnPug09ZL3G/qAYVAJUc/DxKYT//jIm nI3fn8PkmR53K4H0f/SrWst9ISJietc= X-Received: by 2002:a63:31d8:: with SMTP id x207mr782925pgx.428.1569293380882; Mon, 23 Sep 2019 19:49:40 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:ec07:55c0:9c8c:b3de]) by smtp.gmail.com with ESMTPSA id q204sm146791pfc.11.2019.09.23.19.49.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Sep 2019 19:49:40 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 23 Sep 2019 19:48:47 -0700 Message-Id: <05e4f56159ad4cff83bec10f1355be3ce5864201.1569292053.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior][ 07/50] libid3tag: CVE-2017-11551 is the same as CVE-2004-2779 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: 0663e5f8f906803685f018061d51fd6277916e50) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch | 1 + 1 file changed, 1 insertion(+) -- 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-multimedia/libid3tag/libid3tag/10_utf16.patch b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch index 8d09ce7..10e0890 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch +++ b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch @@ -6,6 +6,7 @@ https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch Upstream-Status: Pending CVE: CVE-2004-2779 +CVE: CVE-2017-11551 Signed-off-by: Changqing Li From patchwork Tue Sep 24 02:48:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 174245 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3584356ill; Mon, 23 Sep 2019 19:50:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfpxLCHnvhq/uhjJquW+wUP3UFGzF/gziK5nXQKRu6ntg/S+1DPRh+W+bwtw9giy26rJ4T X-Received: by 2002:a62:ee04:: with SMTP id e4mr695605pfi.262.1569293436579; Mon, 23 Sep 2019 19:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569293436; cv=none; d=google.com; s=arc-20160816; b=O9vF0RWkBY7nX8eEpRPMlctcwBRHL4gODDnQJRTHjDXOPDvm7gW+TcGlJd6YSswFFw QvbciHLRulZCxsKfESePbWf9z7+GB+cQxH8YnUxFacOEYVrqp29etlbQVlWVtfrcTjA6 U2xJVTxyU3sFc0Ixk1pxfqQSGDi6gimPFaB/N6q9uww3Lv1zsilqihYtMv9mJkDhCsEU ulinfmPpVm22unn0uMxv4Bx7L5IUKw2MyjGyFlodjDGLvgIk46hd8tAsXuW+qFNFpHmB 6m3VWywHkpbcVEtuFPkYvlrQehflqWLljKD5wXz0QMxqj23c1BM9bgKfwio14vfZwN6l MEIA== 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=nKs4YIwZOUIpV8SfjeDKgom8cicln2RO4591jzg9lHg=; b=G6T68Id/ZCWp7cHRP/H1bcouHmLz/jPYaUV0BfIRJJOxK/hTT7EnoTvZ238GlZ199Q 7ODxskCF89RIsbuu6IsHSz45G9Zi3cjADubc4GWgzNMvZOBJ1szkVc9OYMKGrSm4iWxC /+46OiyBgFqHQKhM2ub4Fkh95zvQ+7mZpG2oKxb1TErXVxqIalPaWFTkXfzDi393QgIZ 3CxKD72tk64sFPks9If3JCQJ/c2HFMJ+b+aRVSnKutc7qiXodwlMhE0kQKZK7rq5jvWO 3rzVfi04KxMlhUvF7t2k7OR6UroyWOOWt7ickv1E2HHvD1vRZ3RdHAgKjt+hYweaxwCB 9KJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DU8mA2Pa; 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 b1si528571plk.219.2019.09.23.19.50.35; Mon, 23 Sep 2019 19:50:36 -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=@gmail.com header.s=20161025 header.b=DU8mA2Pa; 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 E2E207ECCF; Tue, 24 Sep 2019 02:49:48 +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 E21FF7E831 for ; Tue, 24 Sep 2019 02:49:40 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id a3so337873pgm.13 for ; Mon, 23 Sep 2019 19:49:42 -0700 (PDT) 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=hnT581ksGjvHz3tiL++Grc54cuBUBtoclFnz+7uX0dY=; b=DU8mA2PaiTgH1hobqzp6ObXuBdFx2L1XcxSVuJK9iBPsROuR/gXad6lbmgElKeYfwo VcRzf+72IGjNGbYz9/A5koZvs+r+J0yCwuCP4pthDZZPF7jWeBNGfabfmaEiTgm+8825 UtQI6alXj0TMEvJ3IgcnB5uriA+eghHKNagt8DYIBepOAmiu2myNLPdcLfl+i1GMTYcm RSktzUyqVTf+2awQYqe61ZtjMswRzaN09FtLUSX2Y2/XO6580k9tVbgdK1GI+JVEqpkj UGFkSC9Lg0JiweuPC5uitN2sRyEEi1CPQnUD8CnmBp+u6k+36MRcc8Tzl9Q19OT86PSV nqKw== 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=hnT581ksGjvHz3tiL++Grc54cuBUBtoclFnz+7uX0dY=; b=AxqvwQXIJCQxgkLnL0cig8njYvDMKSe5Hkqe4UAUu7cyVe69l2cN640ODTgF4IqaUh mG5Wy5PUOn6fwk16WAEf43BWAggqDqrUOu6IlyCj8W73t3Xos/X34dUFI1Opq7MHn/SP JPyaY48E6eHmFCziRN5FWXEhHAJANcq1kUA+/LkC5AHKIIjqxZKi3QTba2Cmu7lIlXBP woBs+OHjq44WpqzG4HelH6PeQDYiGK9XWOQNsaGqi4rKi5J1jGFigaCepyjmcuEvNZej HRMQOab+pzAWpdajV1Ehb5BYpQaAuqMATmh/LrfLwoE37odwSza9iOtdpym6kuIBR/ht putg== X-Gm-Message-State: APjAAAVV6m0yI70PQMGK+DsLkDR/cpkozvazmaTvFbjrwKYaOw/C0+EC jQn6Tbo3xGDGL78Jg15XH7WPVzmzOSQ= X-Received: by 2002:a63:e1a:: with SMTP id d26mr764504pgl.73.1569293381873; Mon, 23 Sep 2019 19:49:41 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:ec07:55c0:9c8c:b3de]) by smtp.gmail.com with ESMTPSA id q204sm146791pfc.11.2019.09.23.19.49.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Sep 2019 19:49:41 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 23 Sep 2019 19:48:48 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior][ 08/50] tiff: fix CVE-2019-6128 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: 7293e417dd9bdd04fe0fec177a76c9286234ed46) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libtiff/tiff/CVE-2019-6128.patch | 52 ++++++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.0.10.bb | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.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-multimedia/libtiff/tiff/CVE-2019-6128.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.patch new file mode 100644 index 0000000..6f1fd4d --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-6128.patch @@ -0,0 +1,52 @@ +CVE: CVE-2019-6128 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001 +From: Scott Gayou +Date: Wed, 23 Jan 2019 15:03:53 -0500 +Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128. + +pal2rgb failed to free memory on a few errors. This was reported +here: http://bugzilla.maptools.org/show_bug.cgi?id=2836. +--- + tools/pal2rgb.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c +index 01d8502ec..9492f1cf1 100644 +--- a/tools/pal2rgb.c ++++ b/tools/pal2rgb.c +@@ -118,12 +118,14 @@ main(int argc, char* argv[]) + shortv != PHOTOMETRIC_PALETTE) { + fprintf(stderr, "%s: Expecting a palette image.\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) { + fprintf(stderr, + "%s: No colormap (not a valid palette image).\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + bitspersample = 0; +@@ -131,11 +133,14 @@ main(int argc, char* argv[]) + if (bitspersample != 8) { + fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + out = TIFFOpen(argv[optind+1], "w"); +- if (out == NULL) ++ if (out == NULL) { ++ (void) TIFFClose(in); + return (-2); ++ } + cpTags(in, out); + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth); + TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength); +-- +2.21.0 diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb index 152fa81..a82d744 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb @@ -6,8 +6,8 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://libtool2.patch \ + file://CVE-2019-6128.patch" " - SRC_URI[md5sum] = "114192d7ebe537912a2b97408832e7fd" SRC_URI[sha256sum] = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4" From patchwork Tue Sep 24 02:48: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: 174246 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3584428ill; Mon, 23 Sep 2019 19:50:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzx+RzA9B581mUaXjdrrm44458HRP4F4/QCfuJY7OBJukywMdyDURXcFxEtKXYv8AcqH5dg X-Received: by 2002:a62:3893:: with SMTP id f141mr659586pfa.221.1569293444366; Mon, 23 Sep 2019 19:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569293444; cv=none; d=google.com; s=arc-20160816; b=0XjzkdlnUkVOS3QI8L8Ot4BMYo04BAJyPP+4ZPx2bGHajP2v2u9ethz8TLIDzWs/5H pPYDfiLmT1zyt7QJ2dh/M3ip7+GDAwKn73NcKqyGXgiPABkQAq/GXU1hlRkjUEGRcUSv iMvAJ8CD/RE5vDMej+ngB9mmZ9nAp7zjQg85+oO06uVwHvCHf7jh6nRq/8IP+8h/aHRz 47p3AjlKCDXzU6VBIJlGtYgse6/Bt7vNQFzFP1wtlwzNsHuxjWKgkrDWSl52L5WOTzJ8 RPcKvKYg8WYgfHWKVyWe48tFbPR297RVxbBlFdJ50nBOPCPFSAwsikRfWqY20xYyMSzf sWtw== 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=ejbzneT1czepXYgWGrCA/0uN7Wn1JAehgsQFcWkJe5g=; b=hUvVrya3+h95wi33Pzp6rO6n25tCDT3Bz/XRiVSpu70b01EOM117eIIsE6ktfOgpr5 ajltgNWPeEMWLMmezOwB8wK8EuCCQN7GsfJeZ/xZ162jRel6u+pb1dLCLxXOrjsZZ0fu MFwGiL8Pe9XcoJasmZQB+xo10EB3iZ2Mcnf8HA2N98OM6PTdhQSiZn31Jly2ENv0RR1O gRo3YNh8XxZAaKgeS6YpSplqpSH0ufwTirr4sF8ITa7vJCe6XtnnHF+p876r2uyonTnA TpNo9+sreDu6vJpbff9WSnUHZojfR48QYzQaISw5VrH6cUO2qE+lr34g70bQ9ExlcNNK 7Zzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KraRMYa3; 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 f5si467986plo.385.2019.09.23.19.50.43; Mon, 23 Sep 2019 19:50:44 -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=@gmail.com header.s=20161025 header.b=KraRMYa3; 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 1F76E7ED16; Tue, 24 Sep 2019 02:49:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mail.openembedded.org (Postfix) with ESMTP id DFC2C7E950 for ; Tue, 24 Sep 2019 02:49:41 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id d22so271422pll.7 for ; Mon, 23 Sep 2019 19:49:43 -0700 (PDT) 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=3pIZnIk0lHetOo/VGL1JT/6O03AleRFQfmhuCRz4bmk=; b=KraRMYa37j6p+bu4zgYjTgTdUa+vgmkZqK0kVXyhDR3NbksoV8QfLrsXB/SUu6mrow PzVAVocgsyQVT5edDu75tmab+rj10UWblIorB61RpsQe+HBP0lbCYy8nMe5eUKCXbiIg nNsuzJ0myF2OkGVSaXccPyb3bjcsrt+QQsHYy34XKFGxJ7sd1BbT+/Aqvvw2HsZafTN/ ZwMvDy3bmrK/DM1YmqZY/P+XcvQdiPbnBxZ6Ef8d4tJrg8AtFXB26PEVpLxA0P1T0B2J 8RwClWVP+LwLP7CEQp4GjvK/6K9B8Ur9dU7bYzOC1Q2HQzaXX07OTrnE1y2FOFndemG1 EFVw== 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=3pIZnIk0lHetOo/VGL1JT/6O03AleRFQfmhuCRz4bmk=; b=OHIJQgJbUi9h+aFB7HJGGY/Df+VzG3RVOmbbhWsCpA3LqpPqJdIdZYQdAi5/fIYUiK ZbFm8CMiPqtspV6I6DcGT9LtPRjzMcLEOfdrfhGdQcrozWQHMmZjVRFJeiqq3i2eOGEL Vw9gHTFdlrqfUAwvPQFo6iV0FMHk+t/hSHBs+B/2YRgTH7wtCVuI6ozsDUnWM57KwVZ/ ArEahS8174b+IOgYeBs6xv42XN+Mdjwd9fzkZP72lexmXQKRejO+xL58v32xYpR+EYGc npIO7fLy6BBLhGOHKzQDLxrGps1VefCpz96X+8n+aZQs70e7SUktz9RApG4h1j6y+7Jv +nUw== X-Gm-Message-State: APjAAAVN1aQtaHEiBBTwEfKGi4uu9CzqTHTvcP7vAfGBd9pKzmCsAfI2 mQMzgu48m3ER39LaDg/I4iQUd+L9jLA= X-Received: by 2002:a17:902:a9c6:: with SMTP id b6mr744670plr.40.1569293382823; Mon, 23 Sep 2019 19:49:42 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:ec07:55c0:9c8c:b3de]) by smtp.gmail.com with ESMTPSA id q204sm146791pfc.11.2019.09.23.19.49.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Sep 2019 19:49:42 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 23 Sep 2019 19:48:49 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior][ 09/50] tiff: fix CVE-2019-7663 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: d06d6910d1ec9374bb15e02809e64e81198731b6) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libtiff/tiff/CVE-2019-7663.patch | 77 ++++++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.0.10.bb | 3 +- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.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-multimedia/libtiff/tiff/CVE-2019-7663.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch new file mode 100644 index 0000000..f244fb2 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch @@ -0,0 +1,77 @@ +CVE: CVE-2019-7663 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From c6fc6c1fa895024c86285c58efd6424cf8078f32 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard +Date: Mon, 11 Feb 2019 10:05:33 +0100 +Subject: [PATCH 1/2] check that (Tile Width)*(Samples/Pixel) do no overflow + +fixes bug 2833 +--- + tools/tiffcp.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index 2f406e2d..f0ee2c02 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -1408,7 +1408,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + int status = 1; + uint32 imagew = TIFFRasterScanlineSize(in); + uint32 tilew = TIFFTileRowSize(in); +- int iskew = imagew - tilew*spp; ++ int iskew; + tsize_t tilesize = TIFFTileSize(in); + tdata_t tilebuf; + uint8* bufp = (uint8*) buf; +@@ -1416,6 +1416,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + uint32 row; + uint16 bps = 0, bytes_per_sample; + ++ if (spp > (0x7fffffff / tilew)) ++ { ++ TIFFError(TIFFFileName(in), "Error, cannot handle that much samples per tile row (Tile Width * Samples/Pixel)"); ++ return 0; ++ } ++ iskew = imagew - tilew*spp; + tilebuf = _TIFFmalloc(tilesize); + if (tilebuf == 0) + return 0; +-- +2.20.1 + + +From da6454aa80b9bb3154dfab4e8b21637de47531e0 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard +Date: Mon, 11 Feb 2019 21:42:03 +0100 +Subject: [PATCH 2/2] tiffcp.c: use INT_MAX + +--- + tools/tiffcp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index f0ee2c02..8c81aa4f 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include + +@@ -1416,7 +1417,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) + uint32 row; + uint16 bps = 0, bytes_per_sample; + +- if (spp > (0x7fffffff / tilew)) ++ if (spp > (INT_MAX / tilew)) + { + TIFFError(TIFFFileName(in), "Error, cannot handle that much samples per tile row (Tile Width * Samples/Pixel)"); + return 0; +-- +2.20.1 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb index a82d744..8e3e227 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb @@ -6,7 +6,8 @@ CVE_PRODUCT = "libtiff" SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://libtool2.patch \ - file://CVE-2019-6128.patch" + file://CVE-2019-6128.patch \ + file://CVE-2019-7663.patch \ " SRC_URI[md5sum] = "114192d7ebe537912a2b97408832e7fd" SRC_URI[sha256sum] = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4" From patchwork Tue Sep 24 02:49:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 174247 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3587124ill; Mon, 23 Sep 2019 19:54:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzO0x9CwlGNt0/kc41wnMMHgREqBy7Ac224BNYv8kKiv8uFUDc24s8bxkM1Q9cbpwOvHHN1 X-Received: by 2002:a17:90b:294:: with SMTP id az20mr475032pjb.16.1569293682852; Mon, 23 Sep 2019 19:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569293682; cv=none; d=google.com; s=arc-20160816; b=WIqVyYolKoYHfzsbIrEaseKAUwAe0VxsB4ScI/lOcciiehE3ylcHNoa4l63jKOAWNC Wh9k3c3E1hEdGTNgwPu4cTf6sJadmiv8c5Wi9aRowPKPWieBgivh6G54pOBiKxU6p73k cVR2Ep1RhHuvDqELF8N146I5gHSCpqmVI5y4fSVBiu1AB+qNgvTDEvqXTsNym4FRDWcB DtDdMl+ycOtey617iYYmZfByU17CwjFlohNTSCWaNrUXdJPW4MabeSfJFJ9UWayRgtvt UduLG7ahnZYT2q9b3BP+6+g70Hju0oA+BANtwBrBtECM2lsI1Ro8zzGOxW4AYnJXOr+t rlSA== 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=OFBObqdMbV/XFlLFcFr9vYYEN40ueg+9f4T5zERyw0k=; b=aGXkjEXCxCVWX1iHA21hlJCjnRZjtewTQvIKO2Fp0GgDzIDvNGb0WR25d4iSjWSc3h DNOtZzX/Jd/m3faP1ZhexbC01bRg+aXwAsZyMGhgBIjXylFu0yjeNOkH3yqmcgEOAvwT NdXzBC/JItNfDLlJEDc/NIXIBp7G20wT+DPKKjbvFPIiWUhf+uFXtBjMakT//b6eQFG/ xwAMR7XEkO/aoR1CmozASRZ7GckQFwQPVDXU1823j07KfS/QHCLwoZkTCqh5j+OT+Aiq BWulSVQQ+DJ5r53rW0mbmieznMTos2ZMwPfzj7vYnuQ90qlfxII3RA2pYvkq8/T5M0/8 6+zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hoK2OVcl; 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 v11si479441plp.369.2019.09.23.19.54.42; Mon, 23 Sep 2019 19:54:42 -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=@gmail.com header.s=20161025 header.b=hoK2OVcl; 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 9AC547F32C; Tue, 24 Sep 2019 02:50:44 +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 C21CB7F2DE for ; Tue, 24 Sep 2019 02:50:16 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id q10so297398pfl.0 for ; Mon, 23 Sep 2019 19:50:18 -0700 (PDT) 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=sRFkFtQNu/c9RuPbZQKQ20iMl/cNy+QCK9j3pq4pBWs=; b=hoK2OVcljegj9VBr3P45OOxIz7H4InD0MJBnGwclWKU5fbFNY4v+M/m33yjI9E+DcO 2Zg3Onts3OUZ1rLtTijCU50IYHcsBc5mNMDrUHxr0ftkGt+uY8od4+AAkdbQUse8DrfR R5KUAOPOtUTOdGXKDPlnNNqBkUo66gXEkCBiSDtToUGGtMzDpMz6c/GT/ea0NgbadbHH yTOppq8UTvKen+DE5N5sebkYrd3CwDI0AHKNDMwnNkWkCZVI600FCitpyVarxK+F0mO7 ZzdgWOfSFTB+tIN6g/yS4wZ2H4bUVhDdSjXBaypFK9RlzdGa80uNusO4do23sqs+TGJE lhFg== 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=sRFkFtQNu/c9RuPbZQKQ20iMl/cNy+QCK9j3pq4pBWs=; b=cJczFZ9PRwZe3XoEHnYHDDKr13jSx/GADRfl5GF4uoquSCxIJSydserIovaHaLj1os 45ubMjslOQEXs5lA8uHjKiseMYf4wYlStIj/2xvDgAETKIlLDvU2u3LMihZPE6ELOIQ8 Ebt6g6A2XAvHy9MBPFAsKwj2aScNkNdiBredyAeiMgPrIDukJneh5IMUBPDoDbS3Grw/ uXhjprn+2F+HPuKlRNYFivr16frGrQC/CpcJBpFjcjEjaR6SNzQ0jGmmWdGwwtWhLeoK lEgZPy/EvToyI32eBMzJFNJWeJvNyamtPpXnN4V/5YSoUbxlfa619XG5H6m9mh75YVP3 uqmw== X-Gm-Message-State: APjAAAX9w7uYuVqA3Y5A15N/HnlyEqIeI4k5s5VeYqxFlwxriDguX9du /q2r7+nhc6Bal+aft26AcmBND2pKNKg= X-Received: by 2002:a65:628a:: with SMTP id f10mr760141pgv.155.1569293417809; Mon, 23 Sep 2019 19:50:17 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:ec07:55c0:9c8c:b3de]) by smtp.gmail.com with ESMTPSA id q204sm146791pfc.11.2019.09.23.19.50.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Sep 2019 19:50:17 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Mon, 23 Sep 2019 19:49:24 -0700 Message-Id: <143ff6959233db2ebd10791a3b2b362097593aba.1569292053.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [warrior][ 44/50] kernel-fitimage: uboot-sign: fix missing signature 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: Jun Nie u-boot.bin with dtb & signature should be placed in ${B} so that it can be deployed by u-boot as expected. Otherwise, the version without signature is installed. Signed-off-by: Jun Nie Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/classes/uboot-sign.bbclass | 4 +++- 1 file changed, 3 insertions(+), 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/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass index 8beafff..1fc2a37 100644 --- a/meta/classes/uboot-sign.bbclass +++ b/meta/classes/uboot-sign.bbclass @@ -66,7 +66,7 @@ concat_dtb_helper() { install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then cd ${DEPLOYDIR} - cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${UBOOT_BINARY} > ${UBOOT_IMAGE} + cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE} else bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." fi @@ -77,10 +77,12 @@ concat_dtb() { mkdir -p ${DEPLOYDIR} if [ -n "${UBOOT_CONFIG}" ]; then for config in ${UBOOT_MACHINE}; do + CONFIG_B_PATH="${config}" cd ${B}/${config} concat_dtb_helper done else + CONFIG_B_PATH="" cd ${B} concat_dtb_helper fi