From 621266d3a4e8c70b305d3194080d6402ca97e1ac Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 3 Jul 2014 08:16:39 +0200 Subject: [PATCH] automount: check for recursive automount automount_mount calls run_command which may trigger an automount again. This results in an endless loop. A simple way to trigger this is: mkdir /x; automount /x false; cd /x; something Use a static variable to detect if we are currently in automount_mount() and bail out if we are. Signed-off-by: Sascha Hauer --- fs/fs.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index b0ac918ac..dd410b731 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -409,6 +409,12 @@ static void automount_mount(const char *path, int instat) { struct automount *am; int ret; + static int in_automount; + + if (in_automount) + return; + + in_automount++; list_for_each_entry(am, &automount_list, list) { int len_path = strlen(path); @@ -444,8 +450,10 @@ static void automount_mount(const char *path, int instat) else automount_remove(am->path); - return; + break; } + + in_automount--; } BAREBOX_MAGICVAR(automount_path, "mountpath passed to automount scripts");