diff options
| author |   Alex Franco <alejandro.franco@linux.intel.com> | 2015-08-28 17:34:04 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-31 12:24:36 +0100 |
| commit | 8236d57439640a185c0226312cd4903a3ce2f53b (patch) | |
| tree | 95262229652734742440a29918d775c650d3cd22 | |
| parent | 0c21e207537deb1c0290be631b4b7d84fba32842 (diff) | |
| download | openembedded-core-contrib-8236d57439640a185c0226312cd4903a3ce2f53b.tar.gz | |
Fix mode +st on TMPDIR when creating it
A sanity check fails when TMPDIR has setuid, setgid set. It was
proposed to fix this on TMPDIR creation instead of failing with
a sanity test only. This patch handles removal of those special
bits (and additonally, the sticky bit) from BUILDDIR and TMPDIR
when these directories are created.
[YOCTO #7669]
Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sanity.bbclass | 5 | ||||
| -rwxr-xr-x | scripts/oe-setup-builddir | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ef90fc82b52..28643186324 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -686,6 +686,7 @@ def check_sanity_version_change(status, d): status.addresult(check_not_nfs(tmpdir, "TMPDIR")) def check_sanity_everybuild(status, d): + import os, stat # Sanity tests which test the users environment so need to run at each build (or are so cheap # it makes sense to always run them. @@ -839,6 +840,10 @@ def check_sanity_everybuild(status, d): status.addresult("Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % saved_tmpdir) else: bb.utils.mkdirhier(tmpdir) + # Remove setuid, setgid and sticky bits from TMPDIR + os.chmod(tmpdir, os.stat(tmpdir).st_mode & ~ stat.S_ISUID) + os.chmod(tmpdir, os.stat(tmpdir).st_mode & ~ stat.S_ISGID) + os.chmod(tmpdir, os.stat(tmpdir).st_mode & ~ stat.S_ISVTX) with open(checkfile, "w") as f: f.write(tmpdir) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index add0b50e255..f5b7e4e2d05 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -24,6 +24,7 @@ if [ -z "$BUILDDIR" ]; then fi mkdir -p "$BUILDDIR/conf" +chmod -R -st "$BUILDDIR" if [ ! -d "$BUILDDIR" ]; then echo >&2 "Error: The builddir ($BUILDDIR) does not exist!" |