From patchwork Sat Jul 15 19:44:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 788962 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 3x90Q84kr1z9s75 for ; Sun, 16 Jul 2017 05:45:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j7JwwNES"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XCgHFtKm"; 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=PclbqQvsNa6t1JR93YluBrabYu0bArhomi8X2qP7taY=; b=j7JwwNESyLSJXB BFJJElp48D2zDdItdwunbt3kdZgDs2PxGksTVjPrVCCer6KdWqzh44LAYz0abZJ411Dxu+70why3N DgPl9SuZRZPPEjEwaNaCUu9Jhdg2C2YF/em3HSgwMrkbGkJKWhNkLuowk3FDwMfgGpfeWItoKYzVU qndiYlL3U4FSeCymNPTFKcN9BBZDBCKs6MOGgp7k28CHlWNLbVFlKh0U9srMXTOfa8o9XP6WO4khV AzdLfzIb6Y0tST0OWbwlhfLVGJKZ0xgal7I5uGkoFrLCeUWuIOdoO1xJnocH9E8Z9TNXfqczr8Afi YxDJ0076DsMXn6COw6tA==; 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 1dWSzq-00046w-23; Sat, 15 Jul 2017 19:44:58 +0000 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dWSzm-000456-Nb for lede-dev@lists.infradead.org; Sat, 15 Jul 2017 19:44:56 +0000 Received: by mail-oi0-x242.google.com with SMTP id n2so13894513oig.3 for ; Sat, 15 Jul 2017 12:44:32 -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=otiE05Ou4vhOnSOnnESXFp+74+ybfBitODLj2dv7bpk=; b=XCgHFtKmflh0Aa9v2brK/FV/C7GDQisyShLLq3Iq/eBMI2+9oMuW4KDHUvtSqLTkgu WwghLQeV7oCb+0iECay4EJhYPLpTqE/Isas1MPyF15pkJ5FiIWSDy3YTQF32HR5zJ5i7 /+9/1W5lnhBEGogtiiAu6jmiATfSq0Nh/I9vYUkeVOACzRkX6AEFXOLZwFl6Eissqljj x8pm7kNWsFiVWfwViTcjYhy87gwX/y48SOS48SlHhXbpOBdT0GqKR55R+M+U9+sjv9Su 3DXlsLX9IjBBsbtoWG6BJxQWBZ0SR4hjjMpj2wmEPocvFlIV76DPtrCwsh1Dja1f1tgb YooA== 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=otiE05Ou4vhOnSOnnESXFp+74+ybfBitODLj2dv7bpk=; b=bugfJsrqXDoaaov+wJcr0tatvULW+O/IV72ja8O/bacyeqZOcdcQu1NCgkBX/9/Nnc aehxeUWUcwLpiFeGOOaPVWkHoLmLN4uZbWDcZEsAfSZYlCz0i7eKfa+Rrt5afdiJ26H/ lFjNTbt47wVkRov9IvnBr4er7gMftoebg8tLp2VnPLVXj+u6/EeY1BUlnDVvQYGlg1X/ 7rWZijjrPMqONT3IZBgCSyphfqoYztgGj7cEQ88vkkot85DEc3+wwA+igrTDjjgAXHzZ 0KLLsEUOKlQ+ovrVc9HYo1i2DPFKyuhEw0ApxwgpHrPABjs6c2uYZQovo+yRLkDhe4Ex ir1A== X-Gm-Message-State: AIVw112aAepaPrxK8S3KNSxhVfiq9yxySh9QN5vQbDKgCd1XurewKo1r ouGswmDEV4l+npiYZN4= X-Received: by 10.202.220.195 with SMTP id t186mr9931358oig.111.1500147872032; Sat, 15 Jul 2017 12:44:32 -0700 (PDT) Received: from cox.net ([2001:470:d:73f:8869:d13:bc8a:d969]) by smtp.gmail.com with ESMTPSA id g3sm15244785oif.21.2017.07.15.12.44.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 12:44:31 -0700 (PDT) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Sat, 15 Jul 2017 12:44:23 -0700 Message-Id: <20170715194424.6494-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170715_124454_847423_65C32664 X-CRM114-Status: GOOD ( 11.06 ) 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 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_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 procd 1/2] init: Propagate sysupgrade_exec_upgraded() 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 , mschiffer@universe-factory.net, john@phrozen.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org chroot() can fail and its return value should be checked against so propagate sysupgrade_exec_upgraded() return value to its caller. Fixes: 63789e51ed91 ("init: add support for sysupgrades triggered from preinit") Signed-off-by: Florian Fainelli --- system.c | 7 +++---- sysupgrade.c | 10 ++++++---- sysupgrade.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/system.c b/system.c index 6cd2b624b3be..59ddc214e6f6 100644 --- a/system.c +++ b/system.c @@ -400,10 +400,9 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj, if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX]) return UBUS_STATUS_INVALID_ARGUMENT; - sysupgrade_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]), - blobmsg_get_string(tb[SYSUPGRADE_PATH]), - tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL); - return 0; + return sysupgrade_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]), + blobmsg_get_string(tb[SYSUPGRADE_PATH]), + tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL); } static void diff --git a/sysupgrade.c b/sysupgrade.c index 30f1836135c9..13ba4050527d 100644 --- a/sysupgrade.c +++ b/sysupgrade.c @@ -22,14 +22,16 @@ #include -void sysupgrade_exec_upgraded(const char *prefix, char *path, char *command) +int sysupgrade_exec_upgraded(const char *prefix, char *path, char *command) { char *wdt_fd = watchdog_fd(); char *argv[] = { "/sbin/upgraded", NULL, NULL, NULL}; + int ret; - if (chroot(prefix)) { + ret = chroot(prefix); + if (ret < 0) { fprintf(stderr, "Failed to chroot for upgraded exec.\n"); - return; + return ret; } argv[1] = path; @@ -45,5 +47,5 @@ void sysupgrade_exec_upgraded(const char *prefix, char *path, char *command) fprintf(stderr, "Failed to exec upgraded.\n"); unsetenv("WDTFD"); watchdog_set_cloexec(true); - chroot("."); + return chroot("."); } diff --git a/sysupgrade.h b/sysupgrade.h index 8c09fc99d191..3887f71a00a6 100644 --- a/sysupgrade.h +++ b/sysupgrade.h @@ -15,7 +15,7 @@ #define __PROCD_SYSUPGRADE_H -void sysupgrade_exec_upgraded(const char *prefix, char *path, char *command); +int sysupgrade_exec_upgraded(const char *prefix, char *path, char *command); #endif