From patchwork Tue Feb 28 05:53:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 733298 X-Patchwork-Delegate: openwrt@kresin.me 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 3vXSWS2XLtz9s9x for ; Tue, 28 Feb 2017 16:56:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UkgW6UfX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B909ub1B"; 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=Fq66CsbRw8QzqB/R9SC9PLfLdvjCIh3LGWCmnzVxhW8=; b=UkgW6UfX4irssH aKan/7V1SEbLrsknzJptsBgpjg/PKP1zTQ37gSpNoJHJFVEEww2Uvxg7qhND0ZLbXllGXesd211wu i8TAuAf+mo5HhYFq55aic9rPiKj7ebLjkcd3YLNmOL6qgen0PWaXCNs81wqj6KyyPu2vMd+v40aYZ FnYrDcwzAE8dLZMk9znrXuoctaN0NxiO3jbsWgh3fiBljE3mZxjQpPN4RYZ1uSQZkKabfTWEgTit0 b2f7esauB7Vli8tXtDvTIIZu8HKvuzernyBqyVnHuR8ocJ2jAMTDyJ5IZX5nXntXMnvIP1T1NyEtO Eh0wg6LWEa7BNlcFWHPg==; 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 1cialn-0008OB-Dp; Tue, 28 Feb 2017 05:56:19 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ciajK-0006ab-48 for lede-dev@lists.infradead.org; Tue, 28 Feb 2017 05:53:48 +0000 Received: by mail-qk0-x243.google.com with SMTP id u188so553723qkc.3 for ; Mon, 27 Feb 2017 21:53:24 -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=jIjxvNEQSD9E+uX7ummEEbNDm5C0nmi0HEZXZCkALXA=; b=B909ub1B1Qtppomkt+v6G1BbQLXmmpkgY7COTE3hVybuKd9uOpim/Oc2kuINuFtKfr tx+NrpPLzvEayCLvofICU/WuH7ln0TaygboYz+8vEO/TOqtxT3V3H+0UgdlVvoEuKdDp Qvxt3eBdEdiziEeCJAJ7zOGJ6SvTRjOCwfaXzpRwrzl0TZMKzNUgEmY81TV2Xx8i0iJc Gj5muYv31qSV6NxWlPLDP5VnOLKJz4mA/QkNb+5c0rYhuyEJ/1URxrAseojn3RLP2fFb KJkozjdG10T4mT/d2N/nSakQKtee2Ypu6AQGsiflJUKZpF6nXem/LE+1Hjg89HPhRBWQ 0bzg== 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=jIjxvNEQSD9E+uX7ummEEbNDm5C0nmi0HEZXZCkALXA=; b=bDSk4evul6BZF8uT2S0AbaBbP5jddE5FdaJMJEgrzjnR1ezj3ZXR813bdDpKGkYapF DFqIs+4uV3SHLiWQ+PN21/6rAxpfovgrl1CBTqQcSsKclaYm1i6HlYVjQrFsFUufY3jK 4wvLjlClKavQxyoNPrztdbjU58P6RBa5dd9l6h0fPEA/AIqR7hFLoP3Et9yLxjOduLYy FKAWT2WY0vnm+lNXwqymzh+r14W3E1znvDfm7CNwA2I/T5X92AIZ5nCCRRWsJD4gCS0j RJKgMWeZ7R924BzerPAXjmekaA1kSBcS2kL+r9U+Mnh6quFydasDuyWQ6CVCbyPcLuQ0 /7og== X-Gm-Message-State: AMke39l61fvO50ip8gElk/g3srkpYEj9BbWhcW50Tvxpmjgix+AorMVyolZIbmAh3uP0jw== X-Received: by 10.55.33.220 with SMTP id f89mr709710qki.89.1488261203734; Mon, 27 Feb 2017 21:53:23 -0800 (PST) Received: from fainelli-laptop.vpn.broadcom.net ([2001:470:d:73f:a116:863b:e34d:e904]) by smtp.gmail.com with ESMTPSA id l73sm454353qke.12.2017.02.27.21.53.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2017 21:53:23 -0800 (PST) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Mon, 27 Feb 2017 21:53:18 -0800 Message-Id: <20170228055318.15460-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-20170227_215346_273337_5CB645B7 X-CRM114-Status: UNSURE ( 8.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 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:400d:c09:0:0:0:243 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] 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: Florian Fainelli , steven@midlink.org, john@phrozen.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Florian Fainelli --- 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");