summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Qi <qi.chen@windriver.com>2016-02-19 10:38:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-04 17:10:59 +0000
commitf818f7359c1a5db2c5c041c42eecb9f0434d9800 (patch)
treebe0e81c73349e2ed40bcf8733849822ce480eb11
parent092984669d8590627cfb188a0aa00244e22c4671 (diff)
downloadopenembedded-core-f818f7359c1a5db2c5c041c42eecb9f0434d9800.tar.gz
openembedded-core-f818f7359c1a5db2c5c041c42eecb9f0434d9800.tar.bz2
openembedded-core-f818f7359c1a5db2c5c041c42eecb9f0434d9800.zip
insane.bbclass: make the checking stricter for unsafe references in scripts
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>
-rw-r--r--meta/classes/insane.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b9adea77c8..ebf92ac621 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -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)