Skip to contentSkip to conversation

Fix ltp selinux testsuite for rhel5

PATCH In review Stephen Smalley 2 participants 2 messages May 5, 2009 – May 11, 2009 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix ltp selinux testsuite for rhel5

Some changes on top of the prior patches to enable the ltp selinux testsuite to run successfully on rhel5. Changes:
- Fix the extraction of the release version to exclude Client/Server/etc.
- Make the ioctl test detect kernel version and adjust the test logic to match the expected selinux_file_ioctl() logic.
- Prevent runcon from consuming the options to chcon in selinux_relabel.sh.

---

 testcases/kernel/security/selinux-testsuite/refpolicy/Makefile               |    2 
 testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c    |   28 +++++++---
 testcases/kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh |    2 
 3 files changed, 23 insertions(+), 9 deletions(-)
kernel/security/selinux-testsuite/refpolicy/Makefile +1 -1
diff -u testcases/kernel/security/selinux-testsuite/refpolicy/Makefile testcases/kernel/security/selinux-testsuite/refpolicy/Makefile
@@ -1,5 +1,5 @@
 REDHAT_RELEASE=$(shell rpm -q redhat-release)
-REDHAT_VERS=$(shell echo $(REDHAT_RELEASE) | cut -f3 -d"-")
+REDHAT_VERS=$(shell echo $(REDHAT_RELEASE) | cut -f3 -d"-" | sed -e "s/[^0-9]*//g")
 POLICYDEVEL = /usr/share/selinux/devel
 SEMODULE = /usr/sbin/semodule
 CHECKPOLICY = /usr/bin/checkpolicy
kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c +21 -7
diff -u testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c
@@ -16,6 +16,7 @@
 #include<sys/stat.h>
 #include<linux/fs.h>
 #include<linux/ext2_fs.h>
+#include <sys/utsname.h>
 
 /*
  * Test the ioctl() calls on a file whose name is given as the first
@@ -25,11 +26,19 @@
  * acess to the given file.
  */
 int main(int argc, char **argv) {
-
+  struct utsname uts;
   int fd;
-  int rc;
+  int rc, oldkernel = 1;
   int val;
 
+  if (uname(&uts) < 0) {
+    perror("uname");
+    exit(1);
+  }
+
+  if (strverscmp(uts.release, "2.6.27") >= 0)
+    oldkernel = 0;
+
   fd = open(argv[1], O_RDONLY, 0);
  
   if(fd == -1) {
@@ -51,19 +60,24 @@
     exit(1);
   }
 
-  /* This one should hit the FILE__IOCTL test and fail. */
+  /*
+   * This one depends on kernel version:
+   * New:  Should hit the FILE__IOCTL test and fail.
+   * Old:  Should only check FD__USE and succeed.
+   */
   rc = ioctl(fd, FIONBIO, &val);
-  if( rc == 0 ) {
+  if( !rc == !oldkernel ) {
     printf("test_noioctl:FIONBIO");
     exit(1);
   }
 
   /*
-   * This one should hit the FILE__READ test and succeed since
-   * read permission had to be granted in order to open the file.
+   * This one depends on kernel version:
+   * New:  Should hit the FILE__READ test and succeed.
+   * Old:  Should hit the FILE__GETATTR test and fail.
    */
   rc = ioctl(fd, EXT2_IOC_GETVERSION, &val);
-  if( rc != 0 ) {
+  if( !rc != !oldkernel ) {
     perror("test_noioctl:EXT2_IOC_GETVERSION");
     exit(1);
   }
kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh +1 -1
diff -u testcases/kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh testcases/kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh
@@ -31,7 +31,7 @@
 	RC=0
 
 	# Verify that test_relabel_t can relabel the file.
-	runcon -t test_relabel_t chcon -t test_relabel_newtype_t $SELINUXTMPDIR/test_file 2>&1
+	runcon -t test_relabel_t -- chcon -t test_relabel_newtype_t $SELINUXTMPDIR/test_file 2>&1
         RC=$?
         if [ $RC -eq 0 ]
         then
Signature · 8 lines
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.
#1 lore raw
Quoted 10 lines · Stephen Smalley

Some changes on top of the prior patches to enable the ltp selinux testsuite to run successfully on rhel5. Changes:
- Fix the extraction of the release version to exclude Client/Server/etc.
- Make the ioctl test detect kernel version and adjust the test logic to match the expected selinux_file_ioctl() logic.
- Prevent runcon from consuming the options to chcon in selinux_relabel.sh.

Thanks.

Regards--
Subrata

Quoted 86 lines

---

 testcases/kernel/security/selinux-testsuite/refpolicy/Makefile               |    2 
 testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c    |   28 +++++++---
 testcases/kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh |    2 
 3 files changed, 23 insertions(+), 9 deletions(-)

diff -u testcases/kernel/security/selinux-testsuite/refpolicy/Makefile testcases/kernel/security/selinux-testsuite/refpolicy/Makefile

kernel/security/selinux-testsuite/refpolicy/Makefile +1 -1
@@ -1,5 +1,5 @@
 REDHAT_RELEASE=$(shell rpm -q redhat-release)
-REDHAT_VERS=$(shell echo $(REDHAT_RELEASE) | cut -f3 -d"-")
+REDHAT_VERS=$(shell echo $(REDHAT_RELEASE) | cut -f3 -d"-" | sed -e "s/[^0-9]*//g")
 POLICYDEVEL = /usr/share/selinux/devel
 SEMODULE = /usr/sbin/semodule
 CHECKPOLICY = /usr/bin/checkpolicy

diff -u testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c

kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c +21 -7
@@ -16,6 +16,7 @@
 #include<sys/stat.h>
 #include<linux/fs.h>
 #include<linux/ext2_fs.h>
+#include <sys/utsname.h>
 
 /*
  * Test the ioctl() calls on a file whose name is given as the first
@@ -25,11 +26,19 @@
  * acess to the given file.
  */
 int main(int argc, char **argv) {
-
+  struct utsname uts;
   int fd;
-  int rc;
+  int rc, oldkernel = 1;
   int val;
 
+  if (uname(&uts) < 0) {
+    perror("uname");
+    exit(1);
+  }
+
+  if (strverscmp(uts.release, "2.6.27") >= 0)
+    oldkernel = 0;
+
   fd = open(argv[1], O_RDONLY, 0);
 
   if(fd == -1) {
@@ -51,19 +60,24 @@
     exit(1);
   }
 
-  /* This one should hit the FILE__IOCTL test and fail. */
+  /*
+   * This one depends on kernel version:
+   * New:  Should hit the FILE__IOCTL test and fail.
+   * Old:  Should only check FD__USE and succeed.
+   */
   rc = ioctl(fd, FIONBIO, &val);
-  if( rc == 0 ) {
+  if( !rc == !oldkernel ) {
     printf("test_noioctl:FIONBIO");
     exit(1);
   }
 
   /*
-   * This one should hit the FILE__READ test and succeed since
-   * read permission had to be granted in order to open the file.
+   * This one depends on kernel version:
+   * New:  Should hit the FILE__READ test and succeed.
+   * Old:  Should hit the FILE__GETATTR test and fail.
    */
   rc = ioctl(fd, EXT2_IOC_GETVERSION, &val);
-  if( rc != 0 ) {
+  if( !rc != !oldkernel ) {
     perror("test_noioctl:EXT2_IOC_GETVERSION");
     exit(1);
   }

diff -u testcases/kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh testcases/kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh

kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh line 37

Quoted 8 lines
kernel/security/selinux-testsuite/tests/relabel/selinux_relabel.sh +1 -1
@@ -31,7 +31,7 @@
 	RC=0
 
 	# Verify that test_relabel_t can relabel the file.
-	runcon -t test_relabel_t chcon -t test_relabel_newtype_t $SELINUXTMPDIR/test_file 2>&1
+	runcon -t test_relabel_t -- chcon -t test_relabel_newtype_t $SELINUXTMPDIR/test_file 2>&1
         RC=$?
         if [ $RC -eq 0 ]
         then

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.