]> code.ossystems Code Review - openembedded-core.git/commitdiff
insane.bbclass: make the checking stricter for unsafe references in scripts
authorChen Qi <qi.chen@windriver.com>
Fri, 19 Feb 2016 02:38:39 +0000 (10:38 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 Mar 2016 17:10:59 +0000 (17:10 +0000)
Previously, the checking for unsafe references is not strict enough. It
only checks whether '/usr/' is in the script. As a result, any script
containing statements like below will match this check.

   PATH="/bin:/sbin:/usr/bin:/usr/sbin"

However, as we can see, this is actually not an unsafe reference. What
we really want to check is something like '/usr/bin/tail', so we should
make the checking stricter.

This patch solves the QA warning in gzip and nfs-utils.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/insane.bbclass

index b9adea77c805a899fff77e075399486571c1abfa..ebf92ac621f579f3e6bd7a56d599b88ec82b52e8 100644 (file)
@@ -428,7 +428,7 @@ def package_qa_check_unsafe_references_in_scripts(path, name, d, elf, messages):
         if bool(statinfo.st_mode & stat.S_IXUSR):
             # grep shell scripts for possible references to /exec_prefix/
             exec_prefix = d.getVar('exec_prefix', True)
-            statement = "grep -e '%s/' %s > /dev/null" % (exec_prefix, path)
+            statement = "grep -e '%s/[^ :]\{1,\}/[^ :]\{1,\}' %s > /dev/null" % (exec_prefix, path)
             if subprocess.call(statement, shell=True) == 0:
                 error_msg = pn + ": Found a reference to %s/ in %s" % (exec_prefix, path)
                 package_qa_handle_error("unsafe-references-in-scripts", error_msg, d)