From patchwork Wed Nov 25 16:33:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1406144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=qUHJgiqJ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EwhveGIC; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4Ch62f68Tnz9sT6 for ; Thu, 26 Nov 2020 03:35:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ETk2solbbWE2229jMim3IsEv7r6Grxk9jvbNpHm3r7M=; b=qUHJgiqJHSiIsUlFRukMOtUstS LHg+sBFqttuOL2wtCkwocE4BSMxpTweBweyL1PTvAUTgPLy5yO1y99hTVIi7PuVr/dicTL9uyUu8Y bKKsg3CK2IZWEpmxhO/XuPlKO7o46XQBpZe+4OETtM3ae886DdU2FtsXfppzbhlynit0unLNmKVpv Clp79v1IQnDK79AuOZOxydrD6Z4MBtM4AmazsjEuhGSd+MDXTMZYIqQz8m5MuPPAVzsUObaGLczL/ 4o1rGEzZGKGl1rNKqkV11TihcAP2nBAgm6oCaiydqxNI1OKyHMgeUsSLi6zpW6QPZOIe3Lq7kwyIq 5gboRPVA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkI-0002PF-Ks; Wed, 25 Nov 2020 16:34:18 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk3-0002K6-9j for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:05 +0000 Received: by mail-lj1-x232.google.com with SMTP id o24so2937202ljj.6 for ; Wed, 25 Nov 2020 08:33:57 -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:mime-version :content-transfer-encoding; bh=qRYy0nSMWdHBVttWWwKLxXBeYyW1Ry9qYUwCaGIwld4=; b=EwhveGICYiBLQy46VnV8Bz/js/ozSYwpPAW40lSpWSIGeVA4g/OK9gb3szzr8tmine T0/tMD/iPkyZ7tLpZ5RKxGVvShxOmw0Yur0RbTlfhqTaBO+D1kwl/Ch4AAdpFckJClvH rhHU9L9ERPg7bDngz6Xy41B4PdQ8Nlt1gh8W+Rd7upk71e+BJsCGt2sB+rmrw8s5AW/A qPvN7rXlw8VbnEYJGgFjlpokpV0rwkJq0KvqOOdZ4IBnwseK0mGT5RCmjl4bwuMcNzqH siFHpu5iwfWhNzHLzfwgrSFJOVlcqH9r1t6HGM51CLu3Me9Bk2SELsDB8bZApTlWRnS2 F+2Q== 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:mime-version:content-transfer-encoding; bh=qRYy0nSMWdHBVttWWwKLxXBeYyW1Ry9qYUwCaGIwld4=; b=ENDXIF95ncEqGr6V2w3X9F39pn/uxtkwqTnbUGxbjpBmFjYiaRLtPti4Ol3wY6EAP5 oOcoIRY2pOhRCWJXXoQxCS3cfKntYanOrjSFa70paJZoPBU6//jTgMbWTLO+ktKvcZCp JqYHbAL9jbAPG9OjAslkzaZ4awzrvdAJAhZ2WeV0DTU0+sFahrLdjRqjWS8woIcJsMoQ NyY9qIUTVH/rGdqT/Hl8Jsx/zOGlkq2CivEUIsaPdAEnRURhMW1+VSBsJtDrUYJqR5vo 2kwYl4KT1o40BAvKP+yQPbPF1ih70H04x6XnZGRNYc4lPjMd+KHHRHy3hXzg8X3WSz65 i2kg== X-Gm-Message-State: AOAM53359AUwKq/GoVCq5cl2z+itt/PnznXaJ1km50m7KM9P0u4IrOw2 UaOXbbz1qrrxTHZhTeQ96LEdfLAdCksJkQ== X-Google-Smtp-Source: ABdhPJzn/UbzCoBAvhBP40+5nKCHf2ltjo32hmACGpj3cex55W1HKI5nw8GFUPFheFBZFTVKIZityQ== X-Received: by 2002:a2e:5c7:: with SMTP id 190mr1815625ljf.403.1606322035745; Wed, 25 Nov 2020 08:33:55 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:55 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/8] mvebu: sysupgrade: remove MBR check Date: Wed, 25 Nov 2020 17:33:34 +0100 Message-Id: <20201125163341.2681-2-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113403_400704_D4239BA8 X-CRM114-Status: GOOD ( 11.49 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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:232 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [tmn505[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [tmn505[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is already done by get_partitions. Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index 184803a50f14..d16ddc500079 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -1,19 +1,7 @@ -get_magic_at() { - local file="$1" - local pos="$2" - get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' -} - platform_check_image_sdcard() { local file="$1" local magic diskdev partdev diff - magic=$(get_magic_at "$file" 510) - [ "$magic" != "55aa" ] && { - echo "Failed to verify MBR boot signature." - return 1 - } - export_bootdevice && export_partdevice diskdev 0 || { echo "Unable to determine upgrade device" return 1