From patchwork Sun Sep 17 04:05:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Gorbachyov X-Patchwork-Id: 814582 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gk5VzcMX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S78Kcj1e"; dkim-atps=neutral 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 3xvwZD3Ww9z9sBZ for ; Sun, 17 Sep 2017 14:07:00 +1000 (AEST) 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=Q/sRX9QIiCHB8ghkawRLHMf8xzDCPFf4Pr2blMIX5Fk=; b=gk5VzcMXQHWfdD u/wjKzf8O6bl7NW1If/e4+vitJYVX2Oj01jzsFfky4Wq/b0O1UnKmeiSeOjxGADG+m65paWUEN5Xm lnXB3oPE/2ALx25G9C5mHtqNXhNHRN0W2AoKK9k9cGKrnpx47H32M6Li1fhEvKRWuj1N73Zo7oh1U fi+6p9QLjjjK0/fbmfxvQDzGdTa3/D0G/y530qk2okLo5KNgDAXNhLMR7wsWu45bmUvVq26HIXlwr xHRFUmOuOaI96c00EnRdFoMtIVY9t+1m406mmffEHurQzSvptOhOeSJJEdEd5ofw8E5Yd2KJGOMQj 6xkRSROdntXLvQfvjivQ==; 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 1dtQqq-0008I4-9y; Sun, 17 Sep 2017 04:06:36 +0000 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dtQqM-0008Bh-Ca for lede-dev@lists.infradead.org; Sun, 17 Sep 2017 04:06:12 +0000 Received: by mail-oi0-x243.google.com with SMTP id v66so1718896oig.1 for ; Sat, 16 Sep 2017 21:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=F9DCt/Fz+ay6Rj4/ETYnyAS+cSsPTdc1uLSxfrbNa+E=; b=S78Kcj1egsbcPxepo3uXchRsdBeqEQlEZV4PYLanVbmPFKAyzBcTGZueWauAH9Qw+v 9ePYqcsZGRiO1m+UmJZxKBhSEsX3Yr80+SOGPrnkR3YUER+INyO9ikErzBAUVFNj/mVA RBo1JP/oat3fXCCNPomv+gzAdQDHgWJBWijcejGICZ3CgceVI0hkKrQlvrIoNc1tlt8v fbNybM/lkgWaWilQ0JnupGqxHIULGDVt6CcXHhbPrOclvYtRTT4RQoKunG05qPQSYS3g L35GAVjomJdW0rU5lf15mnCdgGtoGQ3BXDJt/1A+eevLwGoFl4gcNXlYZzehrQZlPJ8V FGlg== 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=F9DCt/Fz+ay6Rj4/ETYnyAS+cSsPTdc1uLSxfrbNa+E=; b=YzvlVRE+Mysoi/tCX7lkpJOqGoLZytwu3AX2mX3lj5KoPHY8xrLJe4BIiIB5u58s7x wgLwP5iuqf3uA7arPNFb6dTSoXNUQq7bd1nST34o7/1YmbUD4xmJ63VlS7N0VY2golyx 1Cvl2YD1zlp6/6W70hZalczMQr5hf6p/ywPuMKv/4WmQbUTHQPydTP4uqeD2gRHe0EFp MXGo4Kqeyv28GJxwi8Zb18L/VTUFCYeSxvg5mJQHCIicKTKTdKWXs95Kz2OBmxiPfp/p ZPNlTpIy2bYkaGqT2WY+wqMrjBOy9zqEOrh2cX5n/iI8siSap+OIHae0Mdn6G99ysf1T kQRg== X-Gm-Message-State: AHPjjUhIFIGjGVEFavbuhCUnbOlETpSr10rDMoXW5+mkbYzIfL8DKihC z24wJtq+e9QuNGYxF34= X-Google-Smtp-Source: AOwi7QDS1M9sWFNJWT1VzuDuAZl5D8Tp/jQv946fSTRKqC4qcdf6bh/SKVu8GVvNwMdjvoCj983LvA== X-Received: by 10.202.168.140 with SMTP id r134mr30076599oie.232.1505621142021; Sat, 16 Sep 2017 21:05:42 -0700 (PDT) Received: from localhost.localdomain (108-197-236-208.lightspeed.sntcca.sbcglobal.net. [108.197.236.208]) by smtp.gmail.com with ESMTPSA id e8sm6655878oic.7.2017.09.16.21.05.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Sep 2017 21:05:41 -0700 (PDT) From: Maxim Gorbachyov To: lede-dev@lists.infradead.org Date: Sat, 16 Sep 2017 21:05:32 -0700 Message-Id: <20170917040532.3926-1-maxim.gorbachyov@gmail.com> X-Mailer: git-send-email 2.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170916_210607_077364_5B9A0562 X-CRM114-Status: GOOD ( 10.63 ) 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:c06: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 (maxim.gorbachyov[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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] uci/file: replace mktemp() with mkstemp() 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: Maxim Gorbachyov MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Because mktemp() is evil. Signed-off-by: Maxim Gorbachyov --- file.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/file.c b/file.c index 494c649..ad0355b 100644 --- a/file.c +++ b/file.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "uci.h" #include "uci_internal.h" @@ -725,8 +726,8 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag char *name = NULL; char *path = NULL; char *filename = NULL; - struct stat statbuf; bool do_rename = false; + int fd; if (!p->path) { if (overwrite) @@ -772,18 +773,20 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag goto done; } - if (!mktemp(filename)) - *filename = 0; + fd = mkstemp(filename); + if (fd == -1) + UCI_THROW(ctx, UCI_ERR_IO); - if (!*filename) { - free(filename); + if ((flock(fd, LOCK_EX) < 0) && (errno != ENOSYS)) + UCI_THROW(ctx, UCI_ERR_IO); + + if (lseek(fd, 0, SEEK_SET) < 0) UCI_THROW(ctx, UCI_ERR_IO); - } - if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG)) + f2 = fdopen(fd, "w+"); + if (!f2) UCI_THROW(ctx, UCI_ERR_IO); - f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true); uci_export(ctx, f2, p, false); fflush(f2);