From 85ccb95c1110ad7c08d918f39f7930aab38d56f8 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 15 Jul 2017 10:51:20 -0700 Subject: [PATCH] init: Check chroot return value in sysupgrade_exec_upgraded() 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") Reviewed-by: Matthias Schiffer Signed-off-by: Florian Fainelli --- sysupgrade.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sysupgrade.c b/sysupgrade.c index 30f1836..07e33f7 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); + } } -- 2.25.1