From patchwork Thu May 19 18:21:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 624189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r9fgk5bqSz9sdg for ; Fri, 20 May 2016 04:27:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=open-mesh-com.20150623.gappssmtp.com header.i=@open-mesh-com.20150623.gappssmtp.com header.b=wbxZsYi+; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1D549B92068; Thu, 19 May 2016 20:22:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Thu, 19 May 2016 20:22:46 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1A4FBB91FD3 for ; Thu, 19 May 2016 20:22:02 +0200 (CEST) X-policyd-weight: using cached result; rate:hard: -7 Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 19 May 2016 20:22:02 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id n129so48256915wmn.1 for ; Thu, 19 May 2016 11:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tJOlmgALCTXbY4sRNFlfMVdfElIuTgkFqQQajjrOyDk=; b=wbxZsYi+cMzn38lxodMJgjMKgRrVatBq4i+jFEb9OEiKU6dkeO54El7uUYFdIEiJQj RzToMUmuV/BpBvnztpRVAakHWd72/jVPSlLKZ9+SqYcHzvmurIaOdi1QaKRjSh+iOsCA UDpTG9kShAeGkcF62oSOQ/YmyuWemYabZ1QiYt8tasw5Y0JpzCjJeN9PBTHIcYPKv+PQ CpAOFItWL3mFERNM+Kf5y8REs+SOrbcW5jpdbkI0ztEAJD+L2R0QbQh2yCOxtyWTsgId B1oPuk7svUpmwWzcmCF/1YZ01RQnfxYBUNuL4t9ogOfYdYXaIJANqpBX/VKFlWgUgkMt aZfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tJOlmgALCTXbY4sRNFlfMVdfElIuTgkFqQQajjrOyDk=; b=ffnqs8QB58Z11MC0YdrmGWaGfaFxDR+bLKnTbm7mli9KJ7knWJGh4b1vSGcVPQ92IZ vHA6j2pAl+gsvAJAE7hAHSM8PN9IuqCiMYpXzZBhZhw1GItZUB4D5QEt39L0RoTAmHkM Low/lqjLyRNSEHTcAEYtpoP3kd1WrrhRichWqUs9bygNgo91TOXtsGeyH5FXY4wmUs8R /I5dnab8SWRPt0fpaDZ3UtFNsZ5LHXCGxnOL3npcZ80QWBT87neDAAs5q8hXu17hX9BJ lotiixo+g3q6k1QflScYVekaL1mtjaSORk1ha9uKCfmLlQ5bpKMdJisj5MesjM231eGX 5ERA== X-Gm-Message-State: AOPr4FUQrNP5Xn/pLMTZd5ZtjhDKCtxzgXrx2vYeTL9ryNFMei6lwBHr+gxFnsQPQLLpn1td X-Received: by 10.194.241.227 with SMTP id wl3mr15068199wjc.168.1463682121756; Thu, 19 May 2016 11:22:01 -0700 (PDT) Received: from sven-desktop.home.narfation.org (p579E6DC9.dip0.t-ipconnect.de. [87.158.109.201]) by smtp.gmail.com with ESMTPSA id n66sm512030wmf.6.2016.05.19.11.22.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 11:22:01 -0700 (PDT) From: Sven Eckelmann To: openwrt-devel@lists.openwrt.org Date: Thu, 19 May 2016 20:21:01 +0200 Message-Id: <1463682077-19339-18-git-send-email-sven.eckelmann@open-mesh.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463682077-19339-1-git-send-email-sven.eckelmann@open-mesh.com> References: <1463682077-19339-1-git-send-email-sven.eckelmann@open-mesh.com> Subject: [OpenWrt-Devel] [PATCH CC 18/34] scripts/om-fwupgradecfg-gen.sh: Fix u-boot image md5sum check X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Eckelmann MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The u-boot on Open Mesh devices checks the whole transfered image against a md5sum. This is stored inside the option filemd5sum inside the fwupgrade.cfg. The bootloader will not check it when this setting is missing and could therefore write invalid images to the flash. Signed-off-by: Sven Eckelmann Backport of r46925 --- scripts/om-fwupgradecfg-gen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index c790214..fab1582 100644 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh @@ -48,6 +48,7 @@ ROOTFS_FLASH_ADDR=$(addr=$(($KERNEL_FLASH_ADDR + ($KERNEL_PART_SIZE * 1024))); p ROOTFS_SIZE=$(stat -c%s "$ROOTFS_PATH") ROOTFS_CHECK_BLOCKS=$((($ROOTFS_SIZE / $CHECK_BS) - $MD5_SKIP_BLOCKS)) ROOTFS_MD5=$(md5=$(dd if=$ROOTFS_PATH bs=$CHECK_BS count=$ROOTFS_CHECK_BLOCKS 2>&- | md5sum); echo ${md5%% *}) +ROOTFS_MD5_FULL=$(md5=$(md5sum $ROOTFS_PATH); echo ${md5%% *}) ROOTFS_CHECK_SIZE=$(printf '0x%x' $(($ROOTFS_CHECK_BLOCKS * $CHECK_BS))) ROOTFS_PART_SIZE=$(($MAX_PART_SIZE - $KERNEL_PART_SIZE)) @@ -55,6 +56,7 @@ cat << EOF > $CFG_OUT [vmlinux] filename=kernel md5sum=$KERNEL_MD5 +filemd5sum=$KERNEL_MD5 flashaddr=$KERNEL_FLASH_ADDR checksize=0x0 cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; saveenv @@ -63,6 +65,7 @@ cmd_fail=reset [rootfs] filename=rootfs md5sum=$ROOTFS_MD5 +filemd5sum=$ROOTFS_MD5_FULL flashaddr=$ROOTFS_FLASH_ADDR checksize=$ROOTFS_CHECK_SIZE cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; setenv rootfs_size_1 $ROOTFS_PART_SIZE; saveenv