Patchwork [v4] patch.bbclass: increase security

login
register
mail settings
Submitter Constantin Musca
Date Sept. 14, 2012, 2:25 p.m.
Message ID <1347632702-16313-1-git-send-email-constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/36549/
State Accepted
Commit fbe9fc4d5ece1e66b03b4c4bce9b7ffad3b5b138
Headers show

Comments

Constantin Musca - Sept. 14, 2012, 2:25 p.m.
- 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@intel.com>
---
 meta/classes/patch.bbclass |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
Saul Wold - Sept. 16, 2012, 7:52 p.m.
On 09/14/2012 07:25 AM, Constantin Musca wrote:
> - 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@intel.com>
> ---
>   meta/classes/patch.bbclass |   16 ++++++++--------
>   1 file 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"
>
>
Merged into OE-Core

Thanks
	Sau!
Chris Larson - Sept. 16, 2012, 8:04 p.m.
On Fri, Sep 14, 2012 at 7:25 AM, Constantin Musca
<constantinx.musca@intel.com> wrote:
> -            shutil.rmtree(process_tmpdir)
> +            bb.utils.remove(process_tmpdir, True)

In the future, I'd suggest leveraging the ability to pass arguments by
name to clarify the meaning of the boolean argument:

    bb.utils.remove(process_tmpdir, recurse=True).

This makes it a bit more clear when reading the code in the future.

Patch

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"