[LTP] [PATCH 2/3] smack_set_socket_labels.c: Cleanup

[Zeng Linggang]

>From 1733e06a8dca828cdd578db589387b83606df7fd Mon Sep 17 00:00:00 2001
From: Zeng Linggang <zenglg...@cn.fujitsu.com>
Date: Fri, 31 Oct 2014 19:05:19 +0800
Subject: [PATCH] smack_set_socket_labels.c: Cleanup

* Check whether smackfs is set.

* Use 'tst_*'.

* Modify Makefile.

* Some cleanup.

Signed-off-by: Zeng Linggang <zenglg...@cn.fujitsu.com>
---
 testcases/kernel/security/smack/Makefile           |  1 +
 .../security/smack/smack_set_socket_labels.c       | 29 +++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/testcases/kernel/security/smack/Makefile 
b/testcases/kernel/security/smack/Makefile
index e114998..02f3ec4 100644
--- a/testcases/kernel/security/smack/Makefile
+++ b/testcases/kernel/security/smack/Makefile
@@ -9,6 +9,7 @@
 top_srcdir             ?= ../../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
+include $(top_srcdir)/include/mk/testcases.mk
 
 INSTALL_TARGETS                := *.sh
 
diff --git a/testcases/kernel/security/smack/smack_set_socket_labels.c 
b/testcases/kernel/security/smack/smack_set_socket_labels.c
index 086e4c8..172ceb2 100644
--- a/testcases/kernel/security/smack/smack_set_socket_labels.c
+++ b/testcases/kernel/security/smack/smack_set_socket_labels.c
@@ -28,6 +28,13 @@
 #endif
 
 #include <sys/xattr.h>
+#include <sys/vfs.h>
+
+#include "test.h"
+#include "usctest.h"
+
+char *TCID = "smack_set_socket_labels";
+int TST_TOTAL = 1;
 
 int main(int argc, char *argv[])
 {
@@ -40,35 +47,39 @@ int main(int argc, char *argv[])
        char *avnot = "TheBadValue";
        int sock;
        int rc;
+       char buf[256];
 
        if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
                sprintf(message, "%s Socket creation failure", argv[0]);
-               perror(message);
-               exit(1);
+               tst_brkm(TFAIL, NULL, "%s", message);
        }
 
+       flistxattr(sock, buf, 256);
+       if (strstr(buf, "security.SMACK64") == NULL)
+               tst_brkm(TCONF, NULL, "smackfs not set.");
+
        rc = fsetxattr(sock, anin, avin, strlen(avin) + 1, 0);
        if (rc < 0) {
                sprintf(message, "%s fsetxattr of %s to %s failure",
                        argv[0], anin, avin);
-               perror(message);
-               exit(1);
+               tst_brkm(TFAIL, NULL, "%s", message);
        }
 
        rc = fsetxattr(sock, anout, avout, strlen(avout) + 1, 0);
        if (rc < 0) {
                sprintf(message, "%s fsetxattr of %s to %s failure",
                        argv[0], anout, avout);
-               perror(message);
-               exit(1);
+               tst_brkm(TFAIL, NULL, "%s", message);
        }
 
        rc = fsetxattr(sock, annot, avnot, strlen(avnot) + 1, 0);
        if (rc >= 0) {
                sprintf(message, "%s fsetxattr of %s to %s succeeded in error",
                        argv[0], anout, avout);
-               perror(message);
-               exit(1);
+               tst_brkm(TFAIL, NULL, "%s", message);
        }
-       exit(0);
+
+       tst_resm(TPASS, "Test %s success.", TCID);
+
+       tst_exit();
 }
-- 
1.8.3.1




------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list