From patchwork Wed Jul 19 15:24:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 791080 X-Patchwork-Delegate: f.fainelli@gmail.com 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="lAwg/8KB"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Cdpzv/8f"; 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 3xCLSj0bXpz9rxm for ; Thu, 20 Jul 2017 01:25:25 +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=eers/cckGfCZJLmHielBoeJ3hxRYHcWl6lBxRnXDftA=; b=lAwg/8KBBmqo8k Z8b2EHDyAfFfs0xXcIc302Ux84q4laXbRp/QkTeDTDZKLA8nqSPPbq9yP/KoakzjRE+uWHjOUNKE/ VH3uf1WhofpCdUnizGtmZbdcKXfe37chFzjCLuwzcN910to5dE92j4eRps1DB2cFbGzG8++hshpqu y6T5M5yUCCahca1g1POREYYGjKUP1t5DNHbyrfw4X0eDrrmEXbY812s5U+8RQzeEa5GKkLYt9CVy9 5chqiwAgIGaQSxtVXxEhudneE20sRHE1eLehm2y7Ebo8dzAu86GcpIRk2Q3Eoz5TIEPw0wq8NGXdQ nhHyGLGdqQYo0Njj+5Kw==; 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 1dXqqW-00074t-LA; Wed, 19 Jul 2017 15:25:04 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXqqS-0006iK-VR for lede-dev@lists.infradead.org; Wed, 19 Jul 2017 15:25:03 +0000 Received: by mail-wm0-x242.google.com with SMTP id p204so493149wmg.1 for ; Wed, 19 Jul 2017 08:24:40 -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=PM9igyNtoCKGBVEQZ9icgEd7aoUMdmn1RVpgb4zipwQ=; b=Cdpzv/8fOn7FBqkWYEt6gobof7JOE/cUIVIcqU0NLSsId5EtZNMyi9tOs7gvCIKm3+ X0/s9FAWm1O4JncoAB2yODVtIWX/lhhxh6RHUP1mQo7Ehx6J8MRSjCcYDsSbvMenGlx4 893m8kA2IH4SpBB/fbBWSbafniUwoMhj401urMJ+jrSW5nHEmlLPB77N4WrdI+F17gfI dkaZwVm2XcrpxFvid3ZYv2D95TD+lVZb/8lLFO6dIwKJxLCKfWq7xoc1wBzFzRbNb/Vf Cbd3JfIlVgo365fheTLtH/l4AmyPguxjgY2SgPMxpwdcggplSk1g15mbeOIXTD55PgGh Nazw== 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=PM9igyNtoCKGBVEQZ9icgEd7aoUMdmn1RVpgb4zipwQ=; b=C8GiFPwIP/A6uLGCHLM5YZE3ZsNOFF6JBEsiuZ8EWrh3ny54BqUInUFnGqalaPk0y4 epjyfFpfHHzGymEjPm82feGAH3ArDeK4z8frW6wTc8tOKJwJjHmvRbHnjYjuXRToNUC4 c44TEUm0LHmgdrUUDUD+Bz327zAK7Mv9r1713fPmNnbTmWqzKqWyt2zksKj9gU//JrWD h069CsRIzzAJD4don6s1Wo9X6WBf1KGULpmG8neWSDGXvItKTzSH1NYkwRIku4Qj8ONy mBxLmdELUB4oGZ/Cv7CRPQ/sC7a+KFdEK2m6fB4uZXt2qNpJyeuZPQlxf7LizHGq4f45 parQ== X-Gm-Message-State: AIVw1122qMopZQQc8Slxj8QRmDQS+u/56hk3i8ES2Whrk2sBwlw9zWoY b6LChoW3AB1nO6Scn0E= X-Received: by 10.28.0.11 with SMTP id 11mr232090wma.169.1500477878533; Wed, 19 Jul 2017 08:24:38 -0700 (PDT) Received: from cox.net ([2001:470:d:73f:c1a0:bc99:c3f4:47eb]) by smtp.gmail.com with ESMTPSA id y191sm191159wmy.28.2017.07.19.08.24.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 08:24:37 -0700 (PDT) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Wed, 19 Jul 2017 08:24:32 -0700 Message-Id: <20170719152433.29479-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-20170719_082501_277499_8393690F X-CRM114-Status: GOOD ( 10.75 ) 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 [2a00:1450:400c:c09: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_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 v3 1/2] init: Check chroot return value in sysupgrade_exec_upgraded() 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, in that case do an exit() since this is a fatal condition that we cannot recover from. Fixes: 63789e51ed91 ("init: add support for sysupgrades triggered from preinit") Signed-off-by: Florian Fainelli Reviewed-by: Matthias Schiffer --- sysupgrade.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sysupgrade.c b/sysupgrade.c index 30f1836135c9..07e33f752d0c 100644 --- a/sysupgrade.c +++ b/sysupgrade.c @@ -26,8 +26,10 @@ void 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; } @@ -45,5 +47,9 @@ 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("."); + ret = chroot("."); + if (ret < 0) { + fprintf(stderr, "Failed to reset chroot, exiting.\n"); + exit(EXIT_FAILURE); + } }