On Thu, 2010-01-14 at 12:10 -0800, Garrett Cooper wrote:
> On Thu, Jan 14, 2010 at 6:07 AM, Stephen Smalley <[email protected]> wrote:
> > On Wed, 2010-01-13 at 14:49 -0800, Garrett Cooper wrote:
> >> Which is what it's doing now, but the original author of the test
> >> wrote the load logic and unload logic so that it used make instead of
> >> using a bourne shell script, etc.
> >
> > To clarify, there are two things happening under that load target
> > presently, one of which is properly handled at build time and one of
> > which is properly handled at test execution time. The first part is
> > building test_policy.pp. The latter is running semodule -i
> > test_policy.pp. So we could split up the Makefile so that the first
> > part is done by the make all/install, and test_selinux.sh merely runs
> > semodule -i test_policy.pp before the test and semodule -r test_policy
> > after the test. One other item I notice is that the current logic
> > copies test_policy* to $POLICY_DEVEL_DIR and runs make there, which
> > isn't necessary - you could just leave them in the refpolicy directory
> > and run make -f $POLICY_DEVEL_DIR/Makefile test_policy.pp.
>
> Ok, this is interesting. So -- is there any particular reason why
> clean (which in this case just called cleanup) should be called before
> load?
>
> So at the end of the day, all of the junk done as part of `load' could
> in fact be done in test_selinux.sh // runtests.sh (I assume the only
> step that couldn't be done is semodule -i? I don't have any hard
> feelings for not putting that logic in those scripts...
I guess I'm not being clear. Most of the work presently done by 'load'
can be done during make all/install. In particular, everything except
for running semodule -i can be done during make all, and then make
install should just copy test_policy.pp (the output of make all) to
the /opt/ltp tree. Then test_selinux.sh only needs to run semodule
-i /path/to/test_policy.pp before the tests and semodule -r test_policy
afterward. We can also avoid copying test_policy.te to the system
policy devel directory altogether. Something like this patch (and
Makefile.selinux can then be removed altogether):
Index: testscripts/test_selinux.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/test_selinux.sh,v
retrieving revision 1.15
diff -u -r1.15 test_selinux.sh
--- testscripts/test_selinux.sh 13 Jan 2010 18:50:53 -0000 1.15
+++ testscripts/test_selinux.sh 14 Jan 2010 20:32:35 -0000
@@ -89,11 +89,10 @@
config_allow_domain_fd_use 0
# build and install the test policy...
-echo "building and installing test_policy module..."
-cd $POLICYDIR
-make load
+echo "installing test_policy module..."
+$(SEMODULE) -i $POLICYDIR/test_policy.pp
if [ $? != 0 ]; then
- echo "Failed to build and load test_policy module, aborting test run."
+ echo "Failed to install load test_policy module, aborting test run."
config_unset_expandcheck
exit 1
else
@@ -126,8 +125,7 @@
/usr/bin/chcon -t $SAVEBINTYPE $LTPROOT/testcases/bin
echo "Removing test_policy module..."
-cd $POLICYDIR
-make cleanup 2>&1
+$(SEMODULE) -r test_policy
if [ $? != 0 ]; then
echo "Failed to remove test_policy module."
exit 1
Index: testcases/kernel/security/selinux-testsuite/refpolicy/Makefile
===================================================================
RCS file:
/cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- testcases/kernel/security/selinux-testsuite/refpolicy/Makefile 14 Jan
2010 12:40:58 -0000 1.17
+++ testcases/kernel/security/selinux-testsuite/refpolicy/Makefile 14 Jan
2010 20:32:35 -0000
@@ -39,10 +39,11 @@
CHECKPOLICY ?= $(DESTDIR)/usr/bin/checkpolicy
CHECKPOLICY_VERS ?= $(shell $(CHECKPOLICY) -V |cut -f 1 -d ' ')
+POLICY_DEVEL_DIR ?= $(DESTDIR)/usr/share/selinux/devel
INSTALL_DIR := testcases/kernel/security/selinux-testsuite/refpolicy
-INSTALL_TARGETS := Makefile.selinux
+INSTALL_TARGETS := test_policy.pp
TEST_POLICY_DIR := $(abs_srcdir)/policy_files
@@ -63,8 +64,17 @@
POLICY_FILES := test_global.te \
$(filter-out test_global.te,$(notdir $(wildcard
$(TEST_POLICY_DIR)/*.te)))
+all: test_policy.pp
+
+test_policy.pp: test_policy.te
+ @set -e; if [ -d "$(POLICY_DEVEL_DIR)" ]; then \
+ $(MAKE) -f $(POLICY_DEVEL_DIR)/Makefile test_policy.pp; \
+ else \
+ echo "ERROR: You must have selinux-policy?-devel? installed."; \
+ false; \
+ fi
+
test_policy.te: $(addprefix $(TEST_POLICY_DIR)/,$(POLICY_FILES))
(cd "$(TEST_POLICY_DIR)" && cat $(POLICY_FILES)) > $@
include $(top_srcdir)/include/mk/generic_leaf_target.mk
-include $(abs_srcdir)/Makefile.selinux
--
Stephen Smalley
National Security Agency
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
