mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] automount: check for recursive automount
@ 2014-07-03  6:21 Sascha Hauer
  0 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2014-07-03  6:21 UTC (permalink / raw)
  To: barebox

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 <s.hauer@pengutronix.de>
---
 fs/fs.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs/fs.c b/fs/fs.c
index b0ac918..dd410b7 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");
-- 
2.0.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] automount: check for recursive automount
@ 2014-07-03  8:34 Rolf Evers-Fischer
  2014-07-03  8:51 ` Uwe Kleine-König
  2014-07-03  9:00 ` Alessandro Rubini
  0 siblings, 2 replies; 6+ messages in thread
From: Rolf Evers-Fischer @ 2014-07-03  8:34 UTC (permalink / raw)
  To: s.hauer; +Cc: barebox

Hi Sascha,

Sascha Hauer <s.hauer@...> wrote:
> +	static int in_automount;
> +
> +	if (in_automount)
> +		return;

It seems that we are using the 'in_automount' without initialization. 
Shouldn't we initialize the static 'in_automount' with 0? Or can we rely 
on the compiler, that all statics will be initialized with zeros?

Best regards,
 Rolf

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-07-03 11:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-03  6:21 [PATCH] automount: check for recursive automount Sascha Hauer
2014-07-03  8:34 Rolf Evers-Fischer
2014-07-03  8:51 ` Uwe Kleine-König
2014-07-03  9:00 ` Alessandro Rubini
2014-07-03  9:33   ` Uwe Kleine-König
2014-07-03 11:05     ` Rolf Evers-Fischer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox