From patchwork Wed Apr 17 10:01:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jonas Mark (BT-FIR/ENG1-Grb)" X-Patchwork-Id: 1086892 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=googlegroups.com (client-ip=2a00:1450:4864:20::137; helo=mail-lf1-x137.google.com; envelope-from=swupdate+bncbc6ynavgsakrb6ps3psqkgqeym2xseq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=de.bosch.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="bUhn5aCD"; dkim-atps=neutral Received: from mail-lf1-x137.google.com (mail-lf1-x137.google.com [IPv6:2a00:1450:4864:20::137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44kd7560Cmz9s3q for ; Wed, 17 Apr 2019 20:01:35 +1000 (AEST) Received: by mail-lf1-x137.google.com with SMTP id x13sf1144578lff.23 for ; Wed, 17 Apr 2019 03:01:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1555495290; cv=pass; d=google.com; s=arc-20160816; b=zw8EB8U58ndfnZGFzbyszefEC7qFy6qfYwGyng+B0xFpU6pPPGiCGi+94/plkmOp+v y/tuYDUxRXO+Ap45B+ivfYunJKXzDaDP9zxdwTrU1L2KJF+xzSdM9VtLBL3mqcNVeEHZ gmmdqi15bFGFoAi7D2OwCmHlj4LRjqesSzFFOcVRWlwmz0sQHdK+P6UIT6X7CY2BB6c5 oLUIylOE/eijD1M0VFhAyEmzoDFjsfyIpN46VEPFLwddNa86pBRokcTV1fyZVZvp2w5r J3rdmne9p/4eit0JCM1KruYZtn78Dk4P7q0hrOo8oJmz9s5DJ04sTFtF7OC/JncJWP0O bezA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=Tf6KLwhsbWvgEboqxQmD3Np12s1nqY+Rxr73rUZZNmU=; b=aFH2uzglCGrTYGzrHCgfix62arqoGYDcPdS17MiJJKUuYD60veAY8pTeXxtReC4wJy T6jmFX9OyOKfeOqqmHCwaJ06LjHyD/rRGi11ip1iEKJo/vT6iro7YBGZZp2vbIbnUX+F 8CnFKNXa84zZNYNRiBJF1dAALm4NrX09BuxthKT1RmO9dE3GHXUIH7lNwZPQds+q2jkD vBSyTtV4tr7HYERX33sOH2o0nezDdYqYE/cG7/vqQnBy/ypapeRjiaLz0d0QaeP7tU9i oe/FYxPiGdYp60wJJC75nmwLGjAP5C2WjLqC/nvmDoaf/VcmOlmDStxaIQ+7H24jT3KQ LH6A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=2015-01-21 header.b=STpiHQzP; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=de.bosch.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Tf6KLwhsbWvgEboqxQmD3Np12s1nqY+Rxr73rUZZNmU=; b=bUhn5aCDct9jKeNQTfVO8AQhyGPi+RYqP9q1F9DULJ3pQnXbwIEW6BAx5Y6ISZUEhF yd3W7WZ6S0Fy+f+6v8uC6+hd4Xus3Q03QpmCUmZ6O3QHAdbLwVoij23v+cz5k6CgWn1F obFwkABnynnqUfonUWu3+5zIMdSjim5+uELRphORZAwroTbBJkBrLldFfhzTbBrTcxIw +W1IWGN8z4SYGmImAeh1VlfwdX3vOGGtk58rqDdFphvtkSUUOg/SOpLUw3Nku18wda/O Ekn3OpXuh7dO0cUg/pPpqsanGt6fGSgDijJ4ExOuTpT1Zy4plO1XMEihOFKW5X1F55Tb DKgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=Tf6KLwhsbWvgEboqxQmD3Np12s1nqY+Rxr73rUZZNmU=; b=mCEslkjcs/ZvnJb/iTDGNb49BCmKMrXad3ineVapsyioZYnJI81bUrO5F45IckL9ZR 5nfE7GB96BZkhm7J7EyXLLH2VWBV9qdab+z097fzW3eDXdQEmEr9XeXb/IWVsQpQLyRj No2Tzji5xFolitxujywTJB0ahN0OVOS6LJxuIt1KgQDqMOle3QwUYVk/rGftK91xhgRe S6PamJ7rSdblUTlV5pThCqP6lWIPWNPRgzyBZF5AlZcmRz6P7jLR+PwdT6U9uW9TcV6I a6KoX0sI5HNjruu5USi/XAPcuOJj//9heSRwWXSvk0SbtmOgUI4jD2x7ds4VVZXyM2k5 mLTw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAXpQEEFwSU28lURKwJ8I427PE7/CUCgVI5mMSL0THEawc1VPjz6 lzaLRom2nXWmO+477RxpQHQ= X-Google-Smtp-Source: APXvYqz7tloz6ueP0cZjSCKHen9ZnMLAozvElFZS9LcozlADg4qt6Z1FcFhrdSFpo/+VZfwXTEpCaA== X-Received: by 2002:a2e:42cf:: with SMTP id h76mr45354659ljf.95.1555495290059; Wed, 17 Apr 2019 03:01:30 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9c88:: with SMTP id x8ls1109230lji.1.gmail; Wed, 17 Apr 2019 03:01:29 -0700 (PDT) X-Received: by 2002:a2e:8881:: with SMTP id k1mr4244774lji.7.1555495289490; Wed, 17 Apr 2019 03:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555495289; cv=none; d=google.com; s=arc-20160816; b=drz+wITSyMu2PUDStjn4LHuWU8r0OklCWQliE1DlRaK4J1APrpt4uBl+o5reIZ/bFn efeq6bUhbQkiTk8/OltJXNvEgFH/7N4GfU1UNeruo6AMjlo77+VoabH1U8WcB7OmpDip +VSHW2WsZV6lTT9NADVEonjfICT1pYaHOtr/zPzYaF+ktnhIpdNLdSn+LDcIfoGeMU1X zkpYXTPRSQc2Ozb5IPZe0tAemEdDb4QknklDDx/1+JCImoIVMShu7cvaWwpynKkuSURJ Pio0C5nCOKbFx1e1kFie1iNeQuHMOU5/ftqXomVf3ei3NYUcv30NXNp7FZhy8mpyHRN+ n/KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=1MbVAjAFi22BzkdOVY+e9gVCyHWIZTcbSqGPkC9meUU=; b=nLHypNT+RMPoTamFbmLL1g1I8htj/97eNbkgiAepWBMuTT6l8RkaajgEDKc2w/XVkv IjNMdsSSB9WmimF7Q2mnLZbImOe/mf0NGZQnHIAvEwmDSsT1NsZerCd1joKC+UGsLGxc ujSTwqRgELmWIh2NafVt4TlEVX2xNU8DrbbmvduBhLNbaSrp1BdN23l1OrgJtGsVgpEJ FZMSTpX3jzCr77GThV1ybkW+xVwuKi7CGfXmXXt7M3pzIOgWx3rFYIhYmmgpRW3LkhAF A87y1NfLF28at5mwyPRDKYpcq6hAdBEJfJUbu7qxmbDGA0awDqq/e1DxwoqWuVNEbom+ RvCw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=2015-01-21 header.b=STpiHQzP; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=de.bosch.com Received: from de-out1.bosch-org.com (de-out1.bosch-org.com. [139.15.230.186]) by gmr-mx.google.com with ESMTPS id v21si1362609lfg.2.2019.04.17.03.01.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 03:01:29 -0700 (PDT) Received-SPF: pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) client-ip=139.15.230.186; Received: from fe0vm1649.rbesz01.com (unknown [139.15.230.188]) by si0vms0216.rbdmz01.com (Postfix) with ESMTPS id 44kd6w5kK2z1XLW3K; Wed, 17 Apr 2019 12:01:28 +0200 (CEST) Received: from fe0vm7918.rbesz01.com (unknown [10.58.172.176]) by fe0vm1649.rbesz01.com (Postfix) with ESMTPS id 44kd6Z3S85z2S0d; Wed, 17 Apr 2019 12:01:10 +0200 (CEST) X-AuditID: 0a3aad10-03fff70000007f88-bc-5cb6f966b5e4 Received: from fe0vm1651.rbesz01.com ( [10.58.173.29]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by fe0vm7918.rbesz01.com (SMG Outbound) with SMTP id 05.B0.32648.669F6BC5; Wed, 17 Apr 2019 12:01:10 +0200 (CEST) Received: from FE-HUB2000.de.bosch.com (fe-hub2000.de.bosch.com [10.4.103.109]) by fe0vm1651.rbesz01.com (Postfix) with ESMTPS id 44kd6Z1PbszR73; Wed, 17 Apr 2019 12:01:10 +0200 (CEST) Received: from luchador.grb-fir.grb.de.bosch.com (10.19.187.97) by FE-HUB2000.de.bosch.com (10.4.103.109) with Microsoft SMTP Server id 15.1.1713.5; Wed, 17 Apr 2019 12:01:09 +0200 From: Mark Jonas To: CC: , , Subject: [swupdate] [libubootenv][ 1/2] Fix missing return zero in libuboot_load_file Date: Wed, 17 Apr 2019 12:01:08 +0200 Message-ID: <1555495268-7509-1-git-send-email-mark.jonas@de.bosch.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA22Sf0wTZxzG+bZHOSuvOY4yv1aZyyVOQqYDf0R0rJlZosh+aDLDH6ZRDzho Ywt4V1AwIywmW+qgBXUIRNFZEwPNzNIZbbMKsTMIDUxJFGx1VQkoQRMhqMPMoHcWbP/YP2++ 7/O8n/d578nRarYxSU+by2yCWMZbOI2W0m76LX1VyatLxiyHU5fzU/DrnBO+mcQvVHntbb1U nr+pT7NDtUubWyxYzFWC+Klhr9bkGnJDRTd1sMPZpKmDsPoILKCRWYf3+u3yrKVZpkWFT3tu QHTjB+zuatFEN17AupFHoCAaJhNDvd53uI7RYf/IUJIyq5ldOFh/gVLmVCYfbx/za5SZYlZg 8PbVd2cIswWHRl1J0egPMfS3XR3VU7CvdZSK3oN4dXxc3QikLc5qi7POgKoT0kqErCrrho3Z OavFQkGqycpeXVRu9UC0HPnFvmBJABgauGRCnl4ysol8lVRtDcB6WsWlkdkpWVpUWF5cbeIl 0x6x0iJInJ4su5lvZFPfy1JlodUsSebysgAgreZ0ZHPxRSNLivnqGkEsj2IBWEpT3GJSSm83 skwpbxP2CUKFIM67n9E0h8Q0IwemiEKpcLDEbLHN21w6gYSEBPaDeCc+VkUvCMBaOlnO/la5 gkgVvFUyl87hS6I4O6/G0CBs0C8mhxSGUVxTZdn7VP0ykjDWbmTT4owYOQFPQO4tlWT8K8PJ 8n8Xy0OyVKkoZU6MQWsuywzTocJ27wvAa382J6LP369BR/BmCv5ij6Th9LNOPZ7tdKzEmZeR DHQEZnPx3M+nDWi/9ut2dAZ/N2K43VuE4/+dsqKj53o9oGfqSSNg76szJwEvOg93AJ4bGPAB jntCQcDWk+4bgH8c7b4FGOlqvQM47Tl8F3DmfPMDQG/ziRHAevsDeZ3ofjEKeOzxj9OAr+8P PJdPPnwmr/1vLr+ECblelVzv8U/cSr023vY/9c6pse/V14Gr4butrydtBUyVofaCs04c7rkX blm+snphuCZjf8j5g27bX6Etn0/tjNQ2eag+g/vLCadF/U/97nUf792XvYmrKNCEHzYc6SoY G87Lqp0yN6w5sLtz7Jbro52n02vODg5MUmsnB13nCzeTb2YjfUVbhzP9V1zg/up7X6vf8DhX XM5RkonPzlSLEv8Wgzv3WyMEAAA= X-Original-Sender: mark.jonas@de.bosch.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=2015-01-21 header.b=STpiHQzP; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=de.bosch.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Leo Ruan Signed-off-by: Leo Ruan Signed-off-by: Mark Jonas Acked-by: Stefano Babic --- src/uboot_env.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/uboot_env.c b/src/uboot_env.c index 8e08097..0ccc427 100644 --- a/src/uboot_env.c +++ b/src/uboot_env.c @@ -650,6 +650,8 @@ int libuboot_load_file(struct uboot_ctx *ctx, const char *filename) } fclose(fp); free(buf); + + return 0; } int libuboot_read_config(struct uboot_ctx *ctx, const char *config) From patchwork Wed Apr 17 10:01:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jonas Mark (BT-FIR/ENG1-Grb)" X-Patchwork-Id: 1086893 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=googlegroups.com (client-ip=2a00:1450:4864:20::13b; helo=mail-lf1-x13b.google.com; envelope-from=swupdate+bncbc6ynavgsakrbkpt3psqkgqebl54qfi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=de.bosch.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="TDsKl8vC"; dkim-atps=neutral Received: from mail-lf1-x13b.google.com (mail-lf1-x13b.google.com [IPv6:2a00:1450:4864:20::13b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44kd7w66fXz9s3q for ; Wed, 17 Apr 2019 20:02:20 +1000 (AEST) Received: by mail-lf1-x13b.google.com with SMTP id v7sf3419824lfg.21 for ; Wed, 17 Apr 2019 03:02:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1555495337; cv=pass; d=google.com; s=arc-20160816; b=WJknXTHOP6iA+C8s3K33pYLVY9kMWtzD67ogYQRQbrR5mE1gomHPRy2CD71auU1eTw RnmCb6bU2jIBYzwIDUPQQzUqfccpt96IVzvbgMPe+tkXXL65U0OSynJ9HL6CJ2tCI8Hh 7X+IfV88xuCkt6Tsr4z2j2n0CKeQX+hCzGPMy0BUdjymYv299wmtNGNZx2m2L7wX+Ek5 LCoRttrXAwzE3z3Dm61ZPlHp8lVZNJPcE6uqPfbzi+7qsDNxy+SzYIYRF6KP8htRpXbC vMTLcTI4hVchoQIBbAXpN6lnPoSK9fWZvOyDl9bW1VfTfBnHTSTl6OcqgHHp/i9jtZSD 7SQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=sUNtoMR5tvwOXeXDwYVwVtQ1b8GFXBhuC8gJs0IEc3o=; b=IpNnzX+2/HIq4LqnbVvESrbaGzJ7Vctn6Okh87f+1daC5RNZPaGMXckU8OOZ8PQKef cLC1N5/gKyxAwD7xQtVYhvzRs/ftkcFYG16Nv4+NNvtbLvZoWBSqwXqEtHI9fE+/7En7 +/nlODaodnd7ppTs9JudSYKcQ9L5meBep7WcQRph8sZETMH2nU0rXd9e5+qJR4gBrweQ +QMx2JH/bydVA3Zk2RLzTmEcOnwoOoGWyCeA4gIBdidqRYva7A4IzTbiiz67nQ+dN8Xh rsn+fC/26JgR9V5x6dwYEG9Iqj8gab8wUu9RfJnBi8xnwKrnCrSNohg9TcEv5rPPPBmp YcJg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=2015-01-21 header.b=BTZcklII; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=de.bosch.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=sUNtoMR5tvwOXeXDwYVwVtQ1b8GFXBhuC8gJs0IEc3o=; b=TDsKl8vClIfCzRVn/FrjRRn/Vi6AVT3XQBO9PptLObRvotepeKBNnVORiaWkU+YG5r xXVpDPpj7+vvawlZd02MBt5Ei8892R58gX3Utja0IHUOxXNdSst3z2aTwhshiAjfUekA Q5GjIMFOAQ453wVGs+8K7FP94zEUZrqkYA5KnIUAt/nnP74J8lu85ghgKWcYEirJxGQx KUD3JcEOsyqQ8e+u/93ghm1oSFNPgwxGf8y2FbPubJrK8Goy8QFhqRXg+9X3ypLRSUKm m4eAzCQWAOmhuWLA8RXf16DCGP+RxtWge0i1vjTtOJt0PGs+743MC2XRQt6bkVQiB11g azDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=sUNtoMR5tvwOXeXDwYVwVtQ1b8GFXBhuC8gJs0IEc3o=; b=ZwntWAukhCG8pfFBMMvMyIS4/pWrzOPH0G0czfmFSgj3i+eKslhlDWe7y9wzcPLasn gt//qrslquPd/YrxZxh7gqQLjDAAICQFNSwXP0zt1WLTn0Y+k2Ysk+CGPY5EQ/10BFbn 7HMlSIe5MyIc2wfjG1hQHmQm3pHSMlV1XH7BXFmXW8blGHbClCemT/ZesyG8kVeRHrp4 3ptLga3PwYPqGKMI3hhyqc5pKh97dKY7aIpn10QsGe9KxbdrK41SX+3FKXPpoC1g+Tb/ 5/POtZF3y007QE/6BwqAXPqSxNAwmYIdhOgkprjZFbMmOmlplfJmRpdsUUQYrLfza974 ZJWw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAXoP6kk8OSNdNuSfM9i9UuBYBlnLI+L+EyQZO46ntXUbV/TUfLe l1NHKqHp7T8P9+TBMhqrEso= X-Google-Smtp-Source: APXvYqxpJdrX2d+EYoSxJNS22d/exwU6Thgn/WiE78HukPD33RYsjebGRiM7XnHLBb6cJQYfAv+qDg== X-Received: by 2002:a2e:94c7:: with SMTP id r7mr46698426ljh.91.1555495337740; Wed, 17 Apr 2019 03:02:17 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:6505:: with SMTP id z5ls984665ljb.15.gmail; Wed, 17 Apr 2019 03:02:17 -0700 (PDT) X-Received: by 2002:a2e:9659:: with SMTP id z25mr2420354ljh.9.1555495337182; Wed, 17 Apr 2019 03:02:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555495337; cv=none; d=google.com; s=arc-20160816; b=uGEDe+9YTZOttDMJfemgrUPUd7Me7+4zv2SdaYF5E/ZWeb7D5DEVXxRsxbIfgv6g7g DZzyirkPnMmS1Wz8s7lhJI7pujpjQFAO9zwgLB8FJiPHPdSw9oFJrKpQBOex7NRakrX2 ZMOz2ZaFEQoqP6QCwuF7A0Y4QKpedXoryqf/Z1vFkRv16rEn7huwsB8/HjQlJtoH1Zuu Xz+ci94FG82WueBfDVvkkIweN1Htw7vAR0qHAA79y0FKo4KyAZn6iflTmXp5mNGdWAKq b4z8voiqO7Vzb5tuKlYA9Dypgc+WXEFkwOroyR3eow1QvfHalYFTSZS3oNRtL8mfA8wM wI5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=CjmBMV9q8JGCnIyQzzogp4/eXtLXwDhct3gkcuiYxfk=; b=gCrwCxsQTOJ1LBxgenNv8nsVggbcRl4N9Ae/r9Bx+8FKO7vKSCUoiJPvTn5Va/hm71 3POl9Ecdd3JeH67gckE0UTrWHCnfyl/uFZPAW5P8I8LbHHBCrdQfHuziPRKn/aym36pu Jo9hCVwO1FoJrOrnyOP/tadiR4DsioHExi7+a0t/mSGgNPAILl2WMC1T5dLRURdElSer QeNfBJNkTvsewA4WojEYlQvT6tU54zGRLD7tWnnv0MPLhfXcNjUkOwOIo9N9sXZaK97h Tbo8BqORAyJeoUYcaPdv9j83rPw+wnjj4pbkJZcJgMP38ANiOdUIrH6CH0RGBXBJy25q GP3Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=2015-01-21 header.b=BTZcklII; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=de.bosch.com Received: from de-out1.bosch-org.com (de-out1.bosch-org.com. [139.15.230.186]) by gmr-mx.google.com with ESMTPS id f28si36250lfk.5.2019.04.17.03.02.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 03:02:17 -0700 (PDT) Received-SPF: pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) client-ip=139.15.230.186; Received: from fe0vm1649.rbesz01.com (unknown [139.15.230.188]) by si0vms0216.rbdmz01.com (Postfix) with ESMTPS id 44kd7r2p3hz1XLm4x; Wed, 17 Apr 2019 12:02:16 +0200 (CEST) Received: from fe0vm02900.rbesz01.com (unknown [10.58.172.176]) by fe0vm1649.rbesz01.com (Postfix) with ESMTPS id 44kd6n3G23zF9JR; Wed, 17 Apr 2019 12:01:21 +0200 (CEST) X-AuditID: 0a3aad0c-d01ff700000039d6-be-5cb6f97134db Received: from fe0vm1651.rbesz01.com ( [10.58.173.29]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by fe0vm02900.rbesz01.com (SMG Outbound) with SMTP id D2.82.14806.179F6BC5; Wed, 17 Apr 2019 12:01:21 +0200 (CEST) Received: from FE-HUB2000.de.bosch.com (fe-hub2000.de.bosch.com [10.4.103.109]) by fe0vm1651.rbesz01.com (Postfix) with ESMTPS id 44kd6n12R1zR6c; Wed, 17 Apr 2019 12:01:21 +0200 (CEST) Received: from luchador.grb-fir.grb.de.bosch.com (10.19.187.97) by FE-HUB2000.de.bosch.com (10.4.103.109) with Microsoft SMTP Server id 15.1.1713.5; Wed, 17 Apr 2019 12:01:19 +0200 From: Mark Jonas To: CC: , , Subject: [swupdate] [libubootenv][ 2/2] Return error in case of no valid environment Date: Wed, 17 Apr 2019 12:01:19 +0200 Message-ID: <1555495279-7617-1-git-send-email-mark.jonas@de.bosch.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA22Sf0wTdxjG+V6v9Wi47TiwvhZK9JLNSAWLzii6LNVkAw0R9seSQZrgQc+2 2h/QK4RCNkVNpmQZsHVIu6UwhISBmKGIRUuMjRJQETBGAYM/UAwz1IiK4i+wl4LtH/73vs+T z/vk++RLiOh5iZwwmG2c1cwaGYkUl25uUyQVvu7UqDo7ojf9cjlj09GuWbEaS3e7evF0b3Wf JAvLkX6t5YyGYs669ptdUv2tAx2o4K60xN8zhe1Hj4gKFEkA9RU0VU7gFUhK0JQTg3eum0uC ixfBm7EuFFw8CGZr74kFREIlwkivRyTMsVQsXB0XiEhCROXA0K8ncGGOobbD06ZuiTDj1BdQ +dKPCTNJfQenbzWLg9EJMHLtiCioR0Of8yEevANwYXJSVIVIV5jlCrPqEdaCZLs5VbFJtS5V pUq25nF8qSolOd9iOomC7UR50KVGnQ9RBGKiyJSpTg0tZot5u8mHNhAYs5Scmw5In+VZtHY9 y+tzrUVGjmfkZPzgDg0d81Hmi/JMBp43WMw+BISIiSW3ajs0NKll7aWc1RLEfCiOwJllpI7I 1NCUjrVxezmugLMuulsIggFSPxsIjLZyOq5kt8FoW7QZBYkiIiJoWbgTHosRkT60nogKZO8U TpB8AWviDboFfHkQpxfVEHoZbZQvI8sEhhJcfZH5Y6o8noyYcGvopWFGiHyMRlCgtxjSKMBR gY8XygMyTqgoekEMQeuaAgzlEIPbM4Ogy3tVAtfPupZA53/VFNROHKPgz6G/ZPDCOS2Dmcbb cdD17L4C5gffKuDv+7Mr4Mbz3pVwp6ryS2ho+W0VzF1vV8Kwc1wJjf39qdBR59gCzdOHt8L5 /p5tMDrflgbN7W/T4PhYeQacrG7LgFPegQxoOFiVCUcu/pMJpxzd2VAx/S4b6nrK82HU7cmH J33t2seBMrFAmY41rUKZNtb2iTIX1NDr5PtROlGo/n9nw/ic1pn6b26+Y+KHSfy2Z3XZNn/r oYHuMyXKc8fSFA/G5OPqfq6vuSypBqvw3vH+POS+knViVWvOq+XGH2sHZo4mK38/YJa99x+n 1FOfb3izJysp8/UfCbE1aqn90ct6seXCtRF/y6CrRvlT6fYViu9n1j8rt387nL2vkMF5PZuS KLLy7AcCgn8qEgQAAA== X-Original-Sender: mark.jonas@de.bosch.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=2015-01-21 header.b=BTZcklII; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=de.bosch.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Leo Ruan The fw_utils load environment variables from a persistent storage (e.g. SPI flash) at first. If there is no valid environment in the persistent storage, fw_utils accept a file which contains an initial environment of U-Boot. If no valid environment can be found from the persistent storage and given file, fw_utils continue to work on an empty environment. Specially, fw_setenv stores the environment to persistent storage. This leads problem on booting. This commit fixes the problem by making fw_utils return error in case of no valid environment in persistent storage and given file. Signed-off-by: Leo Ruan Signed-off-by: Mark Jonas Acked-by: Stefano Babic --- src/fw_printenv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fw_printenv.c b/src/fw_printenv.c index a561db4..8dbaf01 100644 --- a/src/fw_printenv.c +++ b/src/fw_printenv.c @@ -123,7 +123,10 @@ int main (int argc, char **argv) { if ((ret = libuboot_open(ctx)) < 0) { fprintf(stderr, "Cannot read environment, using default\n"); - libuboot_load_file(ctx, defenvfile); + if ((ret = libuboot_load_file(ctx, defenvfile)) < 0) { + fprintf(stderr, "Cannot read default environment from file\n"); + exit (ret); + } } if (!is_setenv) {