diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2012-09-14 17:25:02 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-14 17:12:43 +0100 |
commit | ada2c27f751c6f9277787a5e774927bd38797706 (patch) | |
tree | 13c00bf3194181874eacafe8fbb4f5c26f4489b8 /meta/classes/patch.bbclass | |
parent | c4a923bcb0194c05b14d40be7ad4ecd193eb7a69 (diff) | |
download | openembedded-core-contrib-ada2c27f751c6f9277787a5e774927bd38797706.tar.gz |
patch.bbclass: increase security
- Use mkdtemp for generating temp dir names
- Use bb.utils.remove for removing temp dirs
- Add comment for explaining the "patch" workaround
[YOCTO #3070]
(From OE-Core rev: fbe9fc4d5ece1e66b03b4c4bce9b7ffad3b5b138)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/patch.bbclass')
-rw-r--r-- | meta/classes/patch.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index d01043807b..ed12802491 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -139,11 +139,11 @@ python patch_do_patch() { path = os.getenv('PATH') os.putenv('PATH', d.getVar('PATH', True)) - import shutil - process_tmpdir = os.path.join('/tmp', str(os.getpid())) - if os.path.exists(process_tmpdir): - shutil.rmtree(process_tmpdir) - os.makedirs(process_tmpdir) + # We must use one TMPDIR per process so that the "patch" processes + # don't generate the same temp file name. + + import tempfile + process_tmpdir = tempfile.mkdtemp() os.environ['TMPDIR'] = process_tmpdir for patch in src_patches(d): @@ -168,15 +168,15 @@ python patch_do_patch() { try: patchset.Import({"file":local, "strippath": parm['striplevel']}, True) except Exception as exc: - shutil.rmtree(process_tmpdir) + bb.utils.remove(process_tmpdir, True) bb.fatal(str(exc)) try: resolver.Resolve() except bb.BBHandledException as e: - shutil.rmtree(process_tmpdir) + bb.utils.remove(process_tmpdir, True) bb.fatal(str(e)) - shutil.rmtree(process_tmpdir) + bb.utils.remove(process_tmpdir, True) } patch_do_patch[vardepsexclude] = "PATCHRESOLVE" |