From patchwork Wed Mar 1 05:48:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 734084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vY4K22LxKz9s7k for ; Wed, 1 Mar 2017 16:49:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tYdyNnDe"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y6a2aDk9"; dkim-atps=neutral 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=WseMwFXkYYZwecf7uF3H3YCpG7KCRDYN5JWK5TmFiVo=; b=tYdyNnDehD068P kMvhcvLIHcfrl4Y54YMJmtyIykYc2OodhsywHOwqw8ssAF9I4CvvHEVBvD+hDYyfJgj9xEZc8kpTp T6J5GpoSbaCfXXa4WdMyzo4CL/k1aXqcPPmZvN4KgXO9R2UudQP15NIMICPrtWJgh/RspTCx/EBx+ UorZLRQe3rcuQfZKi+Q3se06axSqGUoVEjpvxLYumuXqnOzjYvYKRHaTMLh28jFc/BALNEcLuifF+ icZXcaObuCI4CVNP5TIaxtJdIMU3sqo08BoyHqHv2W557bX3OCnCjo5eJtfQ2C6hqRrOvHS1VOhSt Ji9c5b7klBXuATTLOKJw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cix8a-0004k7-Ng; Wed, 01 Mar 2017 05:49:20 +0000 Received: from mail-ot0-x244.google.com ([2607:f8b0:4003:c0f::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cix8B-0004iX-Ej for lede-dev@lists.infradead.org; Wed, 01 Mar 2017 05:48:56 +0000 Received: by mail-ot0-x244.google.com with SMTP id w44so3272282otw.1 for ; Tue, 28 Feb 2017 21:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3Zn10yHVjA03IK87chsRGxdT89u3DUd/hbSt/q4Rz44=; b=Y6a2aDk9tsuywU18yH+ZKWbqPi+VaDtoX8vPd0Q+7mx1FR3uF8axoyyOKSbhHvbH/Z 1PEkJjaDJwTKh6gjeR5Qh7bHqalgFk3TVIFrvmUfw4NNsGdtL4QAyhqxL4z1SIhl5TjR RNyHxPHhRYSUfJU1iQgqFp3RChU7SGS7uZlwuymNatQ/a8s5tp78jR+hF+Oy6QUuu/F0 0A3mkbFugJniC0xuk4wS/vv6OIZRX2m1Y6kF6m7Qrj4OHoolh0cc0nQO+cCTy96D4yyh RXO0Y79JKSJt0x18zR+f3ULvzk2MLIvPXE+SHcc0zIS3b/bNPp2tiY2RikN3awyBzX0h uxyA== 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; bh=3Zn10yHVjA03IK87chsRGxdT89u3DUd/hbSt/q4Rz44=; b=BSlXigYpJqebEpb6ppuj+QWf5LoJ4MAwk2dCwFrh5tTPY2Tgeaqbpd8J7Rmfdw2reB UL2dH6d3mOYZR2HdZtphB1Fpzqv5GsWqQ5tjlMtXlH1Dka5zcOQR695agU61tn5zX9g/ VFc7Tf9b2NIisVAEKWxESwZLF2E2frLpRKR2xcwJx+lfK5pAjFSag3XrcPV9+yUxHgdb Ah8T5o+WNOkmb/iE0SlTBReRPRUBbaAWSlL8rRnrdEoeW+LiImkeXCvaqhuJoj3y37/O UtOEz3d0YS//Oal8dYhlAy+W1WxpTU/gRDL3eAel6l3KjxVqZnMoA+tVFI86PlICzy+y PjCQ== X-Gm-Message-State: AMke39llpBESQn2YeTb3oy7xwPknRhNiWb9Hw2PGE6HOU03VOvlr8fMpQ7OT7AaOVg0vxg== X-Received: by 10.157.29.100 with SMTP id m91mr3686582otm.6.1488347314477; Tue, 28 Feb 2017 21:48:34 -0800 (PST) Received: from fainelli-laptop.lan ([2001:470:d:73f:a116:863b:e34d:e904]) by smtp.gmail.com with ESMTPSA id k11sm1637072otd.1.2017.02.28.21.48.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 21:48:33 -0800 (PST) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Tue, 28 Feb 2017 21:48:29 -0800 Message-Id: <20170301054829.18827-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-20170228_214855_549484_246B11B3 X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4003:c0f:0:0:0:244 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_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH odhcpd v2] dhcpv6-ia: Check lockf return value X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dedeckeh@gmail.com, Florian Fainelli , steven@midlink.org, dev@kresin.me, john@phrozen.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Check the lockf return value to fix the following warning/error: /home/fainelli/dev/openwrt/trunk/build_dir/target-mipsel-linux-gnu_glibc/odhcpd-2017-02-21-1b630f8b/src/dhcpv6-ia.c: In function 'dhcpv6_write_statefile': /home/fainelli/dev/openwrt/trunk/build_dir/target-mipsel-linux-gnu_glibc/odhcpd-2017-02-21-1b630f8b/src/dhcpv6-ia.c:246:8: error: ignoring return value of 'lockf', declared with attribute warn_unused_result [-Werror=unused-result] lockf(fd, F_LOCK, 0); ^ cc1: all warnings being treated as errors Signed-off-by: Florian Fainelli --- Changes in v2: - provide the warning being fixed here src/dhcpv6-ia.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 888634fe1f29..fb5044884441 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -242,8 +242,12 @@ void dhcpv6_write_statefile(void) int fd = open(config.dhcp_statefile, O_CREAT | O_WRONLY | O_CLOEXEC, 0644); if (fd < 0) return; - - lockf(fd, F_LOCK, 0); + int ret; + ret = lockf(fd, F_LOCK, 0); + if (ret < 0) { + close(fd); + return; + } if (ftruncate(fd, 0) < 0) {} FILE *fp = fdopen(fd, "w");