[oe-commits] Constantin Musca : patch.bbclass: increase security
git at git.openembedded.org
git at git.openembedded.org
Fri Sep 14 16:12:10 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: fbe9fc4d5ece1e66b03b4c4bce9b7ffad3b5b138
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fbe9fc4d5ece1e66b03b4c4bce9b7ffad3b5b138
Author: Constantin Musca <constantinx.musca at intel.com>
Date: Fri Sep 14 17:25:02 2012 +0300
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]
Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 d010438..ed12802 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"
More information about the Openembedded-commits
mailing list