From patchwork Fri Aug 23 06:15:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1151981 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QCWxiGbZ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DPydDjaV"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46FB451Q6Kz9sNp for ; Fri, 23 Aug 2019 16:16:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ner888gt0jUBCVrlWpNTebkV6nbJDJPAYXfTLWxojJ4=; b=QCWxiGbZYPXYtZ GldPaAJcu1eXSWMvQVuRh5UYEUa4wSyKmh3dGqU16TT0hL46xFRwNtaO9pmOkJMUv50XVQznleJ6a Phvucfzua4lpM4AevbfBrPDZs4STS49wPDuKWw8gy5x0CJuyPIDi+Y2eCuu1kxR3ubmxYGcWuU6tr KOQfsCApCv7Xg0kqZBI5EMJER9VeI1MA0yjTGjkjMmUvOsGdpi+aTJw0q2BpfKC6RzWucCb0dfqEb k52RfxljdRVgl2qZ+H0fYJBb7xMxFxS8b04yRvBFXobn4s5JWsr5f61mhBtoMLdoma258fTUO+mGQ GmyohlJIWD27LqFAwvsw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i12rp-0007Em-Fd; Fri, 23 Aug 2019 06:16:09 +0000 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i12rM-0006xl-RG for openwrt-devel@lists.openwrt.org; Fri, 23 Aug 2019 06:15:42 +0000 Received: by mail-lj1-x236.google.com with SMTP id e24so7752257ljg.11 for ; Thu, 22 Aug 2019 23:15:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2WRay9wDdv3x6NycA/+bzklHTd+Zz/xV5alvxY43SUU=; b=DPydDjaVJB9qAtzP5XBNC8I6i64VrqVM3SCZMZk8ERtwURBROuM1RACwANxsb7XwGG BXH+KfdxicCLbGyRQIpaXT7DTWc4QzxJMY3ucipbQLHw7HtjIwD4JBRFjBI3NxNARVt/ fz+V6Qf+77l5q4Xy3+I4crNP3ylCFuVq34Hia1tJJCac+9orD7sTxNw/jsbayJKhAKyS /nRHFaSodHMSe7rGmHewztjE55OCUjU1RmUXQIwJatYuz1E1nVtyg+Tnv/ph3tJU1CEU VelIesSp1CvtKfxbwNeLc9Lz5Izefax0E+57soyqxCEXBFIRDa09hZx76K2xPEUMTLln yqrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2WRay9wDdv3x6NycA/+bzklHTd+Zz/xV5alvxY43SUU=; b=ZtldsahRLkcLp4TR80CVKLlWVQqXY6tOL4KokOJs3kNmHEy40W4bfkMKFmDGdz8r8s LcIUXMAgsMh+jN2YItgS9NBLJvKorPPiRNZXh2puJJNf/xpGJpOfu1ipNlY4gBD9FLdx Iu4g3MYsJruD8a4559M0qeO4Okuf7JCbiM28pVRfGHUOTlTnyzZnosFeZoB0+3Xs2v2Y p5+ol/W3Q3LP7Q3x8T4JcWOqDAObpT0DY/5E0dR3y5pE6QLINvaYgAa4fYFZUgjAles7 pgdjJBQZMWAiFYS5366Nfh7r7Co58Mz67q9XgMZ+ZybVYhI3TOVue1IwvGlzmQU9K64b Hsyw== X-Gm-Message-State: APjAAAWnW+hieusIWE5FpaAb/N2JxTe8I3WlSRb9z0xt981FuZoPorG3 Zu9cmSm6r6Ok22LkaMgfzBp5S7L5 X-Google-Smtp-Source: APXvYqwCwL9/SnQQREdbG1w9IkyRGqRbQFtnHVQIlk2lkF966MvBxrRcnoGMNKzstlR5eyjQltPlnw== X-Received: by 2002:a2e:2c09:: with SMTP id s9mr1835115ljs.222.1566540938873; Thu, 22 Aug 2019 23:15:38 -0700 (PDT) Received: from localhost.localdomain (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id f17sm425212lfa.67.2019.08.22.23.15.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2019 23:15:38 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Fri, 23 Aug 2019 08:15:24 +0200 Message-Id: <20190823061524.28883-2-zajec5@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190823061524.28883-1-zajec5@gmail.com> References: <20190823061524.28883-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_231540_880881_D8E2F2B8 X-CRM114-Status: UNSURE ( 9.02 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:236 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 2/2] brcm47xx: extend firmware validation X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Jo-Philipp Wich , John Crispin Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki This provides TRX validation result, so final JSON may look like: { "tests": { "fwtool_signature": true, "fwtool_device_match": true, "trx_valid": true }, "valid": true, "forceable": true } It also prevents users from installing broken firmware files, e.g.: $ sysupgrade -F /tmp/dhcp.leases Image metadata not found Invalid image type. Please use firmware specific for this device. Image check failed. This firmware can't be installed. Signed-off-by: Rafał Miłecki --- .../brcm47xx/base-files/lib/upgrade/platform.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh index dfd4e97ed2..cc3fabb7f4 100644 --- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh @@ -98,7 +98,10 @@ platform_check_image() { if ! otrx check "$1" -o "$header_len"; then echo "No valid TRX firmware in the CHK image" + notify_check_test_result "trx_valid" 0 error=1 + else + notify_check_test_result "trx_valid" 1 fi ;; "cybertan") @@ -113,17 +116,24 @@ platform_check_image() { if ! otrx check "$1" -o 32; then echo "No valid TRX firmware in the CyberTAN image" + notify_check_test_result "trx_valid" 0 error=1 + else + notify_check_test_result "trx_valid" 1 fi ;; "trx") if ! otrx check "$1"; then echo "Invalid (corrupted?) TRX firmware" + notify_check_test_result "trx_valid" 0 error=1 + else + notify_check_test_result "trx_valid" 1 fi ;; *) - echo "Invalid image type. Please use only .trx files" + echo "Invalid image type. Please use firmware specific for this device." + notify_check_broken error=1 ;; esac