* [PATCH] android-xfstests: allow detection of SELinux
@ 2017-03-11 0:53 Eric Biggers
2017-03-11 1:57 ` Theodore Ts'o
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Eric Biggers @ 2017-03-11 0:53 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: fstests, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
xfstests is supposed to disable the creation of SELinux xattrs because
this interferes with some tests (e.g. generic/062 and generic/377), but
this was not working on Android. For the android-xfstests portion of
the fix, make the following changes:
1. To stop the mount program from stripping the 'context' mount option,
mount selinuxfs and create an empty /etc/selinux/config. This makes the
is_selinux_enabled() function from libselinux return true.
2. To stop xfstests from thinking that SELinux is disabled, link
/usr/sbin/selinuxenabled to /bin/true. (Note: getting the real version
of selinuxenabled by adding selinux-utils to the chroot tarball would
also work, though no other programs from it are needed yet, and some
don't work in the chroot environment yet.)
In combination with the xfstests patch to stop hard-coding SELinux
contexts in xfstests, this fixes the failing tests.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
kvm-xfstests/android-xfstests | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/kvm-xfstests/android-xfstests b/kvm-xfstests/android-xfstests
index 7e3eab3..e798c7e 100755
--- a/kvm-xfstests/android-xfstests
+++ b/kvm-xfstests/android-xfstests
@@ -81,6 +81,14 @@ chroot_prepare()
! mountpoint $CHROOT_DIR/proc > /dev/null && mount proc -t proc $CHROOT_DIR/proc
! mountpoint $CHROOT_DIR/dev > /dev/null && mount --bind /dev $CHROOT_DIR/dev
+# Allow xfstests to detect that SELinux is in use.
+! mountpoint $CHROOT_DIR/sys/fs/selinux > /dev/null && \
+ mount selinuxfs -t selinuxfs $CHROOT_DIR/sys/fs/selinux
+touch $CHROOT_DIR/etc/selinux/config
+if [ ! -e $CHROOT_DIR/usr/sbin/selinuxenabled ]; then
+ ln $CHROOT_DIR/bin/true $CHROOT_DIR/usr/sbin/selinuxenabled
+fi
+
# 'mountpoint' doesn't work with directory bind mounts; use /proc/mounts instead
if ! cut -d' ' -f2 /proc/mounts 2>/dev/null | grep -q '^$CHROOT_DIR/results$'; then
mkdir -p $RESULTS_DIR
@@ -92,6 +100,7 @@ EOF
chroot_wipe()
{
cat <<EOF | adb shell
+umount $CHROOT_DIR/sys/fs/selinux &> /dev/null
umount $CHROOT_DIR/sys &> /dev/null
umount $CHROOT_DIR/proc &> /dev/null
umount $CHROOT_DIR/dev &> /dev/null
--
2.12.0.246.ga2ecc84866-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] android-xfstests: allow detection of SELinux
2017-03-11 0:53 [PATCH] android-xfstests: allow detection of SELinux Eric Biggers
@ 2017-03-11 1:57 ` Theodore Ts'o
2017-03-11 3:47 ` Eric Biggers
2017-04-27 18:16 ` Eric Biggers
2017-04-29 16:40 ` Theodore Ts'o
2 siblings, 1 reply; 5+ messages in thread
From: Theodore Ts'o @ 2017-03-11 1:57 UTC (permalink / raw)
To: Eric Biggers; +Cc: fstests, Eric Biggers
On Fri, Mar 10, 2017 at 04:53:06PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> xfstests is supposed to disable the creation of SELinux xattrs because
> this interferes with some tests (e.g. generic/062 and generic/377), but
> this was not working on Android. For the android-xfstests portion of
> the fix, make the following changes:
>
> 1. To stop the mount program from stripping the 'context' mount option,
> mount selinuxfs and create an empty /etc/selinux/config. This makes the
> is_selinux_enabled() function from libselinux return true.
>
> 2. To stop xfstests from thinking that SELinux is disabled, link
> /usr/sbin/selinuxenabled to /bin/true. (Note: getting the real version
> of selinuxenabled by adding selinux-utils to the chroot tarball would
> also work, though no other programs from it are needed yet, and some
> don't work in the chroot environment yet.)
>
> In combination with the xfstests patch to stop hard-coding SELinux
> contexts in xfstests, this fixes the failing tests.
Thanks!
I think you're missing the list of tests this fixes here?
- Ted
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] android-xfstests: allow detection of SELinux
2017-03-11 1:57 ` Theodore Ts'o
@ 2017-03-11 3:47 ` Eric Biggers
0 siblings, 0 replies; 5+ messages in thread
From: Eric Biggers @ 2017-03-11 3:47 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: fstests, Eric Biggers
On Fri, Mar 10, 2017 at 08:57:36PM -0500, Theodore Ts'o wrote:
> On Fri, Mar 10, 2017 at 04:53:06PM -0800, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> >
> > xfstests is supposed to disable the creation of SELinux xattrs because
> > this interferes with some tests (e.g. generic/062 and generic/377), but
> > this was not working on Android. For the android-xfstests portion of
> > the fix, make the following changes:
> >
> > 1. To stop the mount program from stripping the 'context' mount option,
> > mount selinuxfs and create an empty /etc/selinux/config. This makes the
> > is_selinux_enabled() function from libselinux return true.
> >
> > 2. To stop xfstests from thinking that SELinux is disabled, link
> > /usr/sbin/selinuxenabled to /bin/true. (Note: getting the real version
> > of selinuxenabled by adding selinux-utils to the chroot tarball would
> > also work, though no other programs from it are needed yet, and some
> > don't work in the chroot environment yet.)
> >
> > In combination with the xfstests patch to stop hard-coding SELinux
> > contexts in xfstests, this fixes the failing tests.
>
> Thanks!
>
> I think you're missing the list of tests this fixes here?
>
> - Ted
They're mentioned at the top: generic/062 and generic/377. There may be others
among tests not being run, but those were the ones I observed were fixed.
Eric
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] android-xfstests: allow detection of SELinux
2017-03-11 0:53 [PATCH] android-xfstests: allow detection of SELinux Eric Biggers
2017-03-11 1:57 ` Theodore Ts'o
@ 2017-04-27 18:16 ` Eric Biggers
2017-04-29 16:40 ` Theodore Ts'o
2 siblings, 0 replies; 5+ messages in thread
From: Eric Biggers @ 2017-04-27 18:16 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: fstests, Eric Biggers
On Fri, Mar 10, 2017 at 04:53:06PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> xfstests is supposed to disable the creation of SELinux xattrs because
> this interferes with some tests (e.g. generic/062 and generic/377), but
> this was not working on Android. For the android-xfstests portion of
> the fix, make the following changes:
>
> 1. To stop the mount program from stripping the 'context' mount option,
> mount selinuxfs and create an empty /etc/selinux/config. This makes the
> is_selinux_enabled() function from libselinux return true.
>
> 2. To stop xfstests from thinking that SELinux is disabled, link
> /usr/sbin/selinuxenabled to /bin/true. (Note: getting the real version
> of selinuxenabled by adding selinux-utils to the chroot tarball would
> also work, though no other programs from it are needed yet, and some
> don't work in the chroot environment yet.)
>
> In combination with the xfstests patch to stop hard-coding SELinux
> contexts in xfstests, this fixes the failing tests.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
Ted, this patch seems to have gotten lost; can you apply it? The corresponding
xfstests-dev fix has already been merged. Thanks!
- Eric
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] android-xfstests: allow detection of SELinux
2017-03-11 0:53 [PATCH] android-xfstests: allow detection of SELinux Eric Biggers
2017-03-11 1:57 ` Theodore Ts'o
2017-04-27 18:16 ` Eric Biggers
@ 2017-04-29 16:40 ` Theodore Ts'o
2 siblings, 0 replies; 5+ messages in thread
From: Theodore Ts'o @ 2017-04-29 16:40 UTC (permalink / raw)
To: Eric Biggers; +Cc: fstests, Eric Biggers
On Fri, Mar 10, 2017 at 04:53:06PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> xfstests is supposed to disable the creation of SELinux xattrs because
> this interferes with some tests (e.g. generic/062 and generic/377), but
> this was not working on Android. For the android-xfstests portion of
> the fix, make the following changes:
>
> 1. To stop the mount program from stripping the 'context' mount option,
> mount selinuxfs and create an empty /etc/selinux/config. This makes the
> is_selinux_enabled() function from libselinux return true.
>
> 2. To stop xfstests from thinking that SELinux is disabled, link
> /usr/sbin/selinuxenabled to /bin/true. (Note: getting the real version
> of selinuxenabled by adding selinux-utils to the chroot tarball would
> also work, though no other programs from it are needed yet, and some
> don't work in the chroot environment yet.)
>
> In combination with the xfstests patch to stop hard-coding SELinux
> contexts in xfstests, this fixes the failing tests.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
Applied, thanks.
- Ted
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-29 16:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-11 0:53 [PATCH] android-xfstests: allow detection of SELinux Eric Biggers
2017-03-11 1:57 ` Theodore Ts'o
2017-03-11 3:47 ` Eric Biggers
2017-04-27 18:16 ` Eric Biggers
2017-04-29 16:40 ` Theodore Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox