Skip to contentSkip to conversation

tools: buildman: prevent trying to use the working directory as build dorectory

PATCH New Lothar Waßmann 2 participants 4 messages Jul 5, 2017 – Apr 2, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools: buildman: prevent trying to use the working directory as build dorectory

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message:
OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg

Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory.

---
 tools/buildman/builderthread.py | 4 ++++
 1 file changed, 4 insertions(+)
tools/buildman/builderthread.py +4 -0
index acaf500..3549029 100644
@@ -7,6 +7,7 @@ import errno
 import glob
 import os
 import shutil
+import sys
 import threading
 
 import command
@@ -27,6 +28,9 @@ def Mkdir(dirname, parents = False):
             os.mkdir(dirname)
     except OSError as err:
         if err.errno == errno.EEXIST:
+            if os.path.realpath('.') == os.path.realpath(dirname):
+                print "Cannot create the current working directory '%s'!" % dirname
+                sys.exit(1)
             pass
         else:
             raise
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 tools: buildman: prevent trying to use the working directory as build dorectory

Quoted 7 lines · Lothar Waßmann

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message:
OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg

Quoted 8 lines

Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory.

---
 tools/buildman/builderthread.py | 4 ++++
 1 file changed, 4 insertions(+)

That's nasty, thanks for the fix.

But this is being done inside each thread so I'm not sure how this will be reported, or whether buildman will stop correctly.

Can the check happen before the build even starts, perhaps? E,g, in builder.py?

Regards,
Simon

#2 lore raw

PATCH 1/1 tools: buildman: prevent trying to use the working directory as build dorectory

Hi,

Quoted 17 lines · On Thu, 13 Jul 2017 13:09:58 -0600 Simon Glass wrote:
Quoted 7 lines · Lothar Waßmann

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message:
OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg

Quoted 8 lines

Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory.

---
 tools/buildman/builderthread.py | 4 ++++
 1 file changed, 4 insertions(+)
Quoted 7 lines

That's nasty, thanks for the fix.

But this is being done inside each thread so I'm not sure how this will be reported, or whether buildman will stop correctly.

Can the check happen before the build even starts, perhaps? E,g, in builder.py?

I don't have the time to look deeper into this, perhaps someone more involved with the builman scripts can have a look into this.

Lothar Waßmann

#3 lore raw

PATCH 1/1 tools: buildman: prevent trying to use the working directory as build dorectory

Hi Lothar,

Quoted 22 lines · Lothar Waßmann

Hi,

Quoted 19 lines · On Thu, 13 Jul 2017 13:09:58 -0600 Simon Glass wrote:
Quoted 7 lines · Lothar Waßmann

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message:
OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg

Quoted 8 lines

Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory.

---
 tools/buildman/builderthread.py | 4 ++++
 1 file changed, 4 insertions(+)

That's nasty, thanks for the fix.

Quoted 7 lines
Quoted 5 lines

But this is being done inside each thread so I'm not sure how this will be reported, or whether buildman will stop correctly.

Can the check happen before the build even starts, perhaps? E,g, in builder.py?

I don't have the time to look deeper into this, perhaps someone more involved with the builman scripts can have a look into this.

OK, I've updated this patch. In general my advice is to assume that no one else has time either :-)

Regards,
Simon