From patchwork Sat Dec 3 17:32:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 702342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tWJ7c3fsyz9t1F for ; Sun, 4 Dec 2016 04:35:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M6Ll8Vfe"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cDEBe-0004zx-Ev; Sat, 03 Dec 2016 17:33:22 +0000 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cDEBa-0004iW-FV for lede-dev@lists.infradead.org; Sat, 03 Dec 2016 17:33:19 +0000 Received: by mail-oi0-x242.google.com with SMTP id m75so31542428oig.1 for ; Sat, 03 Dec 2016 09:32:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=i0jt/C0HISyihdnTpd9ZrsRl/4XpasjwnLaB98Ui2+w=; b=M6Ll8VfexJYUXvCwDvBVbAyHAtwnHLwLDazLw8fF/SwmttWFc9qbeHfT8mokA7HZzs wnXXUuYOjPaavRNZ/2xLper8qA2xg/3rtK9IAwK3fx3gpKxg0+MUiR+SM4df3tEoE+Yw Rc+7MU2uX5DtVosqWqOQLaHT0X6m0wnaW9QsQ3fo/lGDrJS8tDgfOwqY3Uvdhk8U+EeL hmI4Lb/yJ1HQqRQadMwMObvnae+Yrx7d5un0jWo7d9vdsE07WZwHOSfNJRB2JAeFB4x5 HcbWoDAFqsMXAm9KmA/rp6dDYWjvls2P28stvJGGy6bUd3ZBLivLuEEf1pZY7TlYxu8F S6PQ== 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; bh=i0jt/C0HISyihdnTpd9ZrsRl/4XpasjwnLaB98Ui2+w=; b=HmC6ceyjCf98ojYxt9jW+N0DeNnYYjxWLAIvIuUMWmG7pXqBkgzplc1HBNgrPQc+BV DlXchUx4z/OifbvWETK17kg+2p48I1PINnJleseMLv/7rgZE8G4CzlaG10hkmVY04ztI lQ3Ynwp6/kFQzHk34ki8pmCZu+6QUNdRAx2Mvx9qFExo/JEvwLgI942nPv00vAyKQAI3 5k5oG+O88tdQ0YaWUBOphS1perpLVP9hLjXzlm4te9/li8afRn+NIpsq8N1nts933iVo GreBLUq+1VDk3txV29bYk0C0hlzwJNQKJCgZ+DN4n307Z37VxW2C4yxDG+4wKtNPHpWd AyoA== X-Gm-Message-State: AKaTC034962zG16Y4zKvLhQ9jsyPxRhU32XjExZqM7lSNPPBBuyZcVhom5D8s99eWy+VOA== X-Received: by 10.157.45.166 with SMTP id g35mr26319790otb.223.1480786377354; Sat, 03 Dec 2016 09:32:57 -0800 (PST) Received: from fainelli-laptop.lan ([2001:470:d:73f:7cb8:730d:76b0:6c10]) by smtp.gmail.com with ESMTPSA id u66sm3435549ota.34.2016.12.03.09.32.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Dec 2016 09:32:56 -0800 (PST) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Sat, 3 Dec 2016 09:32:54 -0800 Message-Id: <20161203173254.28077-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161203_093318_659085_55CD23B3 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:4003:c06:0:0:0:242 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 (f.fainelli[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 Subject: [LEDE-DEV] [PATCH fstools] libfstools: Check return values for fread and system X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , john@phrozen.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org libfstools/rootdisk.c: In function 'rootdisk_volume_identify': libfstools/rootdisk.c:172:7: error: ignoring return value of 'fread', declared with attribute warn_unused_result [-Werror=unused-result] fread(&magic, sizeof(magic), 1, f); ^ libfstools/rootdisk.c:179:7: error: ignoring return value of 'fread', declared with attribute warn_unused_result [-Werror=unused-result] fread(&magic, sizeof(magic), 1, f); ^ libfstools/rootdisk.c: In function 'rootdisk_volume_init': libfstools/rootdisk.c:268:9: error: ignoring return value of 'system', declared with attribute warn_unused_result [-Werror=unused-result] system(str); ^ cc1: all warnings being treated as errors Signed-off-by: Florian Fainelli --- libfstools/rootdisk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libfstools/rootdisk.c b/libfstools/rootdisk.c index d4ff201bf926..b85bcedd98b7 100644 --- a/libfstools/rootdisk.c +++ b/libfstools/rootdisk.c @@ -162,6 +162,7 @@ static int rootdisk_volume_identify(struct volume *v) struct rootdev_volume *p = container_of(v, struct rootdev_volume, v); int ret = FS_NONE; uint32_t magic = 0; + size_t n; FILE *f; f = fopen(rootdev, "r"); @@ -169,14 +170,18 @@ static int rootdisk_volume_identify(struct volume *v) return ret; fseeko(f, p->offset + 0x400, SEEK_SET); - fread(&magic, sizeof(magic), 1, f); + n = fread(&magic, sizeof(magic), 1, f); + if (n != sizeof(magic)) + return -1; if (magic == cpu_to_le32(0xF2F52010)) ret = FS_F2FS; magic = 0; fseeko(f, p->offset + 0x438, SEEK_SET); - fread(&magic, sizeof(magic), 1, f); + n = fread(&magic, sizeof(magic), 1, f); + if (n != sizeof(magic)) + return -1; if ((le32_to_cpu(magic) & 0xffff) == 0xef53) ret = FS_EXT4; @@ -251,6 +256,7 @@ static int rootdisk_volume_init(struct volume *v) { struct rootdev_volume *p = container_of(v, struct rootdev_volume, v); char str[128]; + int ret = 0; if (!p->loop_name[0] && rootdisk_create_loop(p) != 0) return -1; @@ -265,12 +271,12 @@ static int rootdisk_volume_init(struct volume *v) snprintf(str, sizeof(str), "mkfs.f2fs -l rootfs_data %s", v->blk); else snprintf(str, sizeof(str), "mkfs.ext4 -L rootfs_data %s", v->blk); - system(str); + ret = system(str); break; default: break; } - return 0; + return ret; } static struct driver rootdisk_driver = {