Menu
▾
▴
[Ltp-commits] [Git] ltp updated.
|
From: Rishi k. K R. <ris...@li...> - 2010-03-31 10:07:06
|
The branch, pu, has been updated
via f5f06f48d95ce6a3ae82f6bfbb3564cf67fe5e2f (commit)
via c58cf0cff52cc72179c6fb4303509a3f2db19945 (commit)
via 566d1af5a7111408601ea6cb64218585bee8d04a (commit)
via 391e757d43b3ac33a4a435e319ee77b1daa6da76 (commit)
via 008f0d2c45d52af059d7981685921fc53d7354bf (commit)
via b72a24c9eb339841a0c4b82d384a5b3ba10c9ecb (commit)
via f102fd9735f01b4e2c9ae44f3c90d1a56d4d81f8 (commit)
via 7ad24180d690306e129b84d49806f9f176a28d57 (commit)
via 2df915dc1da7c5d92e03856095d3f66601178e58 (commit)
via c65b70531c8d383a957654ad5179cb302b405a3b (commit)
via 95a376d4e50acd0c90bf749060a1974338a082a9 (commit)
via 6e3dd83d9f575d98d76b8b3f642ad6e8793dbdfc (commit)
via 96a4822d72478abce6dceabc816f658ba4ded0d3 (commit)
via c700433fe26d24b975bf241668a9701548e6c21d (commit)
via 4d574b9f3c82a58d88b97e201ac49cddf7bc5c24 (commit)
via e7ed287c04bef2108fa544b0b86629e554403970 (commit)
via 965127e99f1c3e4035a3de621ca0c295de14448b (commit)
via 0a52859d55cf93cdd310ec678868cb4d10e80728 (commit)
via 2784e9a6e36cacad4192f41a8c9044a85428ed27 (commit)
via b80fdefbd1843484e5a3ccc3d5748fee5b4cd1f7 (commit)
via b8ed5460176838d9b714dddbc17685983b4a8b9b (commit)
via e8e3c7598b82b54a7770c48a2422d5d6fa127045 (commit)
from d05498f44de5d3e542b2031b458d84e907604728 (commit)
- Log -----------------------------------------------------------------
commit f5f06f48d95ce6a3ae82f6bfbb3564cf67fe5e2f
Author: Rishikesh K Rajak <ris...@li...>
Date: Wed Mar 31 15:33:56 2010 +0530
Merge branches 'maint' and 'pu' into pu
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +
configure.ac | 1 +
m4/ltp-cap.m4 | 17 +--
m4/ltp-prctl.m4 | 31 +++
testcases/kernel/controllers/cgroup_fj/Makefile | 2 +-
.../controllers/cgroup_fj/run_cgroup_test_fj.sh | 2 +-
testcases/kernel/device-drivers/rtc/Makefile | 29 +++
testcases/kernel/device-drivers/rtc/README | 29 +++
testcases/kernel/device-drivers/rtc/rtc-test.c | 218 ++++++++++++++++++++
testcases/kernel/security/Makefile | 3 +
testcases/kernel/security/cap_bound/cap_bounds_r.c | 44 ++--
.../kernel/security/cap_bound/cap_bounds_rw.c | 58 +++---
.../security/cap_bound/cap_bset_inh_bounds.c | 61 +-----
testcases/kernel/security/cap_bound/check_pe.c | 20 +--
testcases/kernel/security/cap_bound/dummy.c | 26 +--
.../kernel/security/cap_bound/exec_with_inh.c | 34 +---
.../kernel/security/cap_bound/exec_without_inh.c | 35 +---
testcases/kernel/security/filecaps/c.c | 45 ++++
.../kernel/security/filecaps/check_simple_capset.c | 11 +-
.../kernel/security/filecaps/checkforfilecaps.sh | 40 ----
.../kernel/security/filecaps/checkforlibcap.sh | 66 ------
testcases/kernel/security/filecaps/filecapstest.sh | 19 +--
testcases/kernel/security/filecaps/inh_capped.c | 12 +-
testcases/kernel/security/filecaps/print_caps.c | 2 +-
.../kernel/security/filecaps/verify_caps_exec.c | 21 +--
testcases/network/multicast/mc_cmds/mc_cmds | 2 +-
.../conformance/interfaces/sem_getvalue/1-1.c | 21 +-
.../conformance/interfaces/sem_getvalue/2-1.c | 19 +-
.../conformance/interfaces/sem_getvalue/2-2.c | 59 ++----
.../conformance/interfaces/sem_getvalue/4-1.c | 18 +-
.../conformance/interfaces/sem_getvalue/5-1.c | 23 +-
.../conformance/interfaces/sem_post/8-1.c | 4 +-
.../conformance/interfaces/sigset/8-1.c | 14 +-
33 files changed, 548 insertions(+), 441 deletions(-)
create mode 100644 m4/ltp-prctl.m4
create mode 100644 testcases/kernel/device-drivers/rtc/Makefile
create mode 100644 testcases/kernel/device-drivers/rtc/README
create mode 100644 testcases/kernel/device-drivers/rtc/rtc-test.c
create mode 100644 testcases/kernel/security/filecaps/c.c
delete mode 100755 testcases/kernel/security/filecaps/checkforfilecaps.sh
delete mode 100755 testcases/kernel/security/filecaps/checkforlibcap.sh
diff --git a/.gitignore b/.gitignore
index e0ba857..660f345 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ lib*.a
/include/stamp-h1
/m4/Makefile
/m4/Makefile.in
+.gitattributes
+.pc/
+patches/
diff --git a/configure.ac b/configure.ac
index 8a2ebe2..3dd9829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,7 @@ AC_CONFIG_SUBDIRS([ \
])
LTP_CHECK_CAPABILITY_SUPPORT
+LTP_CHECK_PRCTL_SUPPORT
LTP_CHECK_CRYPTO
LTP_CHECK_LINUX_PTRACE
LTP_CHECK_SELINUX
diff --git a/m4/ltp-cap.m4 b/m4/ltp-cap.m4
index 5f8d969..caa436f 100644
--- a/m4/ltp-cap.m4
+++ b/m4/ltp-cap.m4
@@ -23,21 +23,12 @@ dnl LTP_CHECK_CAPABILITY_SUPPORT
dnl ----------------------------
dnl
AC_DEFUN([LTP_CHECK_CAPABILITY_SUPPORT],[
+AH_TEMPLATE(HAVE_LIBCAP,
+[Define to 1 if you have libcap-2 installed.])
AC_CHECK_HEADERS(sys/capability.h,[
- AC_CHECK_HEADERS(attr/xattr.h)
LTP_CAPABILITY_SUPPORT=yes
- AC_CHECK_LIB(cap,cap_free,[
- AC_CHECK_LIB(cap,cap_from_text,[
- AC_CHECK_LIB(cap,cap_set_proc,[
- AC_CHECK_LIB(cap,cap_compare,[
- CAP_LIBS="-lcap"
- ])
- ])
- ])
- ])
- AC_CHECK_DECLS([CAP_BSET_DROP, CAP_BSET_READ, PR_CAPBSET_READ, cap_compare, cap_free, cap_from_text, cap_get_proc, cap_set_file, cap_set_flag, cap_set_proc, cap_to_text],[],[],[dnl
-#include <sys/capability.h>
-]) dnl AC_CHECK_DECLS
+ AC_CHECK_LIB(cap,cap_compare,[AC_DEFINE(HAVE_LIBCAP) CAP_LIBS="-lcap"], [CAP_LIBS=""])
+ AC_CHECK_PROG(HAVE_SETCAP,setcap,setcap,false)
])]
AC_SUBST(CAP_LIBS)
)
diff --git a/m4/ltp-prctl.m4 b/m4/ltp-prctl.m4
new file mode 100644
index 0000000..51edb08
--- /dev/null
+++ b/m4/ltp-prctl.m4
@@ -0,0 +1,31 @@
+dnl
+dnl Copyright (c) Cisco Systems Inc., 2009
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+dnl the GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl Author: Garrett Cooper <yan...@gm...>
+dnl
+
+dnl
+dnl LTP_CHECK_PRCTL_SUPPORT
+dnl ----------------------------
+dnl
+AC_DEFUN([LTP_CHECK_PRCTL_SUPPORT],[
+AC_CHECK_HEADERS(sys/prctl.h,[
+ AC_CHECK_DECLS([PR_CAPBSET_DROP, PR_CAPBSET_READ], [],[],[dnl
+#include <sys/prctl.h>
+]) dnl AC_CHECK_DECLS
+])]
+)
diff --git a/testcases/kernel/controllers/cgroup_fj/Makefile b/testcases/kernel/controllers/cgroup_fj/Makefile
index e0524aa..d18e672 100644
--- a/testcases/kernel/controllers/cgroup_fj/Makefile
+++ b/testcases/kernel/controllers/cgroup_fj/Makefile
@@ -25,6 +25,6 @@ top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
include $(abs_srcdir)/../Makefile.inc
-INSTALL_TARGETS := *.sh
+INSTALL_TARGETS := *.sh cgroup_fj_release_agent
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh b/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh
index 7445725..672f37c 100755
--- a/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh
+++ b/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh
@@ -129,4 +129,4 @@ do
fi
done
-exit 0;
+exit $ret;
diff --git a/testcases/kernel/device-drivers/rtc/Makefile b/testcases/kernel/device-drivers/rtc/Makefile
new file mode 100644
index 0000000..0eefcb0
--- /dev/null
+++ b/testcases/kernel/device-drivers/rtc/Makefile
@@ -0,0 +1,29 @@
+#
+# Copyright (c) Larsen & Toubro Infotech Ltd., 2010
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+# the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+#
+
+CFLAGS = -O2 -Wall -I ../../../../include/
+LIBS = -L ../../../../lib/ -lltp
+SRC = rtc-test.c
+
+
+all: $(SRC)
+ $(CC) $(SRC) $(CFLAGS) $(LIBS) -o rtc-test
+
+clean:
+ rm -f rtc-test
diff --git a/testcases/kernel/device-drivers/rtc/README b/testcases/kernel/device-drivers/rtc/README
new file mode 100644
index 0000000..3094aa7
--- /dev/null
+++ b/testcases/kernel/device-drivers/rtc/README
@@ -0,0 +1,29 @@
+rtc-test.c : Test the Real Time Clock driver
+
+Tests supported as of now
+--------------------------
+1. Read test : This reads the time/date from the RTC
+ ioctls tested :- RTC_RD_TIME.
+
+2. Alarm Test: Sets the alarm to 5 seconds in future and makes sure it rings.
+ ioctls tested :- RTC_ALM_SET, RTC_ALM_READ, RTC_AIE_ON, RTC_AIE_OFF.
+
+3. Update interrupts test : Sets Update interrupts enable on, waits for five
+ interrupts and then turns it off.
+ ioctls tested :- RTC_UIE_ON, RTC_UIE_OFF.
+
+
+How to Build
+------------
+You have to build the complete LTP package before trying to build these tests.
+After building the complete LTP sources enter this directory and issue a 'make'.
+
+How to Run
+----------
+
+ The tests assume the rtc device node to be "/dev/rtc". If you have a
+different node run the test with the name of the node as a parameter.
+
+Eg. If your node is /dev/rtc0, then run the test as
+
+ $ ./rtc-test /dev/rtc0
diff --git a/testcases/kernel/device-drivers/rtc/rtc-test.c b/testcases/kernel/device-drivers/rtc/rtc-test.c
new file mode 100644
index 0000000..a62b033
--- /dev/null
+++ b/testcases/kernel/device-drivers/rtc/rtc-test.c
@@ -0,0 +1,218 @@
+/* rtc-test.c
+ *
+ * Tests for the Real Time Clock driver.
+ *
+ * Copyright (c) Larsen & Toubro Infotech Ltd., 2010
+ *
+ * Author : Silesh C V <Sil...@ln...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "test.h"
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <linux/rtc.h>
+#include <errno.h>
+#include <time.h>
+
+int rtc_fd = -1;
+char *TCID = "rtc01";
+int TST_TOTAL = 3;
+
+
+/* Read and Alarm Tests : Read test reads the Date/time from RTC
+ * while Alarm test, sets the alarm to 5 seconds in future and
+ * waits for it to ring.The ioctls tested in these tests are
+ * RTC_RD_TIME, RTC_ALM_SET, RTC_ALM_READ, RTC_AIE_OFF */
+
+void read_alarm_test(void)
+{
+ struct rtc_time rtc_tm;
+ int ret;
+ unsigned long data;
+ fd_set rfds;
+ struct timeval tv;
+
+ tst_resm(TINFO, "RTC READ TEST:");
+
+ /*Read RTC Time*/
+ ret = ioctl(rtc_fd, RTC_RD_TIME, &rtc_tm);
+ if (ret == -1) {
+ tst_resm(TFAIL, "RTC_RD_TIME ioctl failed");
+ return;
+ }
+
+ tst_resm(TPASS, "RTC READ TEST Passed");
+
+ tst_resm(TINFO, "Current RTC date/time is %d-%d-%d, %02d:%02d:%02d.",
+ rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900,
+ rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
+
+ tst_resm(TINFO, "RTC ALARM TEST :");
+
+ /*set Alarm to 5 Seconds*/
+ rtc_tm.tm_sec += 5;
+ if (rtc_tm.tm_sec >= 60) {
+ rtc_tm.tm_sec %= 60;
+ rtc_tm.tm_min++;
+ }
+
+ if (rtc_tm.tm_min == 60) {
+ rtc_tm.tm_min = 0;
+ rtc_tm.tm_hour++;
+ }
+
+ if (rtc_tm.tm_hour == 24)
+ rtc_tm.tm_hour = 0;
+
+ ret = ioctl(rtc_fd, RTC_ALM_SET, &rtc_tm);
+ if (ret == -1) {
+ tst_resm(TFAIL, "RTC_ALM_SET ioctl failed");
+ return;
+ }
+
+ /*Read current alarm time*/
+ ret = ioctl(rtc_fd, RTC_ALM_READ, &rtc_tm);
+ if (ret == -1) {
+ tst_resm(TFAIL, "RTC_ALM_READ ioctl failed");
+ return;
+ }
+
+ tst_resm(TINFO, "Alarm time set to %02d:%02d:%02d.",
+ rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
+ /* Enable alarm interrupts */
+ ret = ioctl(rtc_fd, RTC_AIE_ON, 0);
+ if (ret == -1) {
+ tst_resm(TINFO, "RTC_AIE_ON ioctl failed");
+ return;
+ }
+
+ tst_resm(TINFO, "Waiting 5 seconds for the alarm...");
+
+ tv.tv_sec = 6;/*set 6 seconds as the time out*/
+ tv.tv_usec = 0;
+
+ FD_ZERO(&rfds);
+ FD_SET(rtc_fd, &rfds);
+
+ ret = select(rtc_fd + 1, &rfds, NULL, NULL, &tv);/*wait for alarm*/
+
+ if (ret == -1) {
+ tst_resm(TFAIL, "select failed");
+ return;
+ } else if (ret) {
+ ret = read(rtc_fd, &data, sizeof(unsigned long));
+ if (ret == -1) {
+ tst_resm(TFAIL, "read failed");
+ return;
+ }
+ tst_resm(TINFO, "Alarm rang.");
+ } else {
+ tst_resm(TFAIL, "Timed out waiting for the alarm");
+ return;
+ }
+
+ /* Disable alarm interrupts */
+ ret = ioctl(rtc_fd, RTC_AIE_OFF, 0);
+ if (ret == -1) {
+ tst_resm(TFAIL, "RTC_AIE_OFF ioctl failed");
+ return;
+ }
+ tst_resm(TPASS, "RTC ALARM TEST Passed");
+}
+
+/* Update_interrupts_test :Once the Update interrupts is enabled,
+ * the RTC gives interrupts (1/sec) on the interrupts line(if the rtc
+ * has one). This is tested by enabling the update interrupts
+ * and then waiting for 5 interrupts.*/
+
+void update_interrupts_test(void)
+{
+ int ret, i;
+ unsigned long data;
+ fd_set rfds;
+ struct timeval tv;
+
+ tst_resm(TINFO, "RTC UPDATE INTERRUPTS TEST :");
+ /*Turn on update interrupts*/
+ ret = ioctl(rtc_fd, RTC_UIE_ON, 0);
+ if (ret == -1) {
+ tst_resm(TFAIL, "RTC_UIE_ON ioctl failed");
+ return;
+ }
+
+ tst_resm(TINFO, "Waiting for 5 update interrupts...");
+ for (i = 1; i < 6; i++) {
+
+ tv.tv_sec = 2; /*2 sec time out for each interrupt*/
+ tv.tv_usec = 0;
+
+ FD_ZERO(&rfds);
+ FD_SET(rtc_fd, &rfds);
+
+ ret = select(rtc_fd + 1, &rfds, NULL, NULL, &tv);
+ if (ret == -1) {
+ tst_resm(TFAIL, "select failed");
+ return;
+ } else if (ret) {
+ ret = read(rtc_fd, &data, sizeof(unsigned long));
+ if (ret == -1) {
+ tst_resm(TFAIL, "read failed");
+ return;
+ }
+ tst_resm(TINFO, "Update interrupt %d", i);
+ } else {
+ tst_resm(TFAIL,
+ "Timed out waiting for the update interrupt");
+ return;
+ }
+ }
+
+ /* Turn off update interrupts */
+ ret = ioctl(rtc_fd, RTC_UIE_OFF, 0);
+ if (ret == -1) {
+ tst_resm(TFAIL, "RTC_UIE_OFF ioctl failed");
+ return;
+ }
+ tst_resm(TPASS, "RTC UPDATE INTERRUPTS TEST Passed");
+}
+
+int main(int argc, char **argv)
+{
+ char *rtc_dev = "/dev/rtc";
+
+ if (argc == 2)
+ rtc_dev = argv[1];
+
+ rtc_fd = open(rtc_dev, O_RDONLY);
+
+ if (rtc_fd < 0)
+ tst_brkm(TBROK | TERRNO, tst_exit, "couldn't open %s", rtc_dev);
+
+ /*Read and alarm tests*/
+ read_alarm_test();
+
+ /*Update interrupts test*/
+ update_interrupts_test();
+
+ close(rtc_fd);
+
+ tst_resm(TINFO, "RTC Tests Done!");
+ return 0;
+}
diff --git a/testcases/kernel/security/Makefile b/testcases/kernel/security/Makefile
index a23ce8f..52b8d06 100644
--- a/testcases/kernel/security/Makefile
+++ b/testcases/kernel/security/Makefile
@@ -29,6 +29,9 @@ include $(top_srcdir)/include/mk/env_pre.mk
ifeq ($(strip $(CAP_LIBS)),)
FILTER_OUT_DIRS := cap_bound filecaps
endif
+ifeq ($(HAVE_SETCAP),false)
+FILTER_OUT_DIRS += filecaps
+endif
# XXX (garrcoop): avoid compilation failures on RHEL 5.4, as reported by
# Mitani-san, because of policy versioning issues...
diff --git a/testcases/kernel/security/cap_bound/cap_bounds_r.c b/testcases/kernel/security/cap_bound/cap_bounds_r.c
index 917d889..0b1c5b3 100644
--- a/testcases/kernel/security/cap_bound/cap_bounds_r.c
+++ b/testcases/kernel/security/cap_bound/cap_bounds_r.c
@@ -32,21 +32,6 @@
#include <sys/prctl.h>
#include <test.h>
-#ifndef CAP_LAST_CAP
-#warning out-of-date capability.h does not define CAP_LAST_CAP
-#define CAP_LAST_CAP 28 /* be ultra-conservative */
-#endif
-
-#ifndef CAP_BSET_READ
-#warning CAP_BSET_READ not defined
-#define CAP_BSET_READ 23
-#endif
-
-#ifndef CAP_BSET_DROP
-#warning CAP_BSET_DROP not defined
-#define CAP_BSET_DROP 24
-#endif
-
char *TCID = "cap_bounds_r";
int TST_TOTAL=1;
@@ -59,17 +44,27 @@ int main(int argc, char *argv[])
int i;
for (i=0; i<=CAP_LAST_CAP; i++) {
- ret = prctl(CAP_BSET_READ, i);
+#if HAVE_DECL_PR_CAPBSET_READ
+ ret = prctl(PR_CAPBSET_READ, i);
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret != 1) {
- tst_resm(TFAIL, "prctl(CAP_BSET_READ, %d) returned %d\n", i, ret);
+ tst_resm(TFAIL, "prctl(PR_CAPBSET_READ, %d) returned %d\n", i, ret);
if (ret == -1)
tst_resm(TINFO, "errno was %d\n", errno);
tst_exit();
}
}
- ret = prctl(CAP_BSET_READ, -1);
+#if HAVE_DECL_PR_CAPBSET_READ
+ ret = prctl(PR_CAPBSET_READ, -1);
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret != -1) {
- tst_resm(TFAIL, "prctl(CAP_BSET_READ, -1) returned %d\n", -1, ret);
+ tst_resm(TFAIL, "prctl(PR_CAPBSET_READ, -1) returned %d\n", ret);
tst_exit();
}
@@ -79,13 +74,18 @@ int main(int argc, char *argv[])
* testing... So let's take an insanely high value */
#define INSANE 63
#define max(x,y) (x > y ? x : y)
- ret = prctl(CAP_BSET_READ, max(INSANE,CAP_LAST_CAP+1));
+#if HAVE_DECL_PR_CAPBSET_READ
+ ret = prctl(PR_CAPBSET_READ, max(INSANE,CAP_LAST_CAP+1));
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret != -1) {
- tst_resm(TFAIL, "prctl(CAP_BSET_READ, %d) returned %d\n", CAP_LAST_CAP+1, ret);
+ tst_resm(TFAIL, "prctl(PR_CAPBSET_READ, %d) returned %d\n", CAP_LAST_CAP+1, ret);
tst_resm(TINFO, " %d is CAP_LAST_CAP+1 and should not exist\n", CAP_LAST_CAP+1);
tst_exit();
}
- tst_resm(TPASS, "CAP_BSET_READ tests passed\n");
+ tst_resm(TPASS, "PR_CAPBSET_READ tests passed\n");
#else
tst_resm(TCONF, "System doesn't have POSIX capabilities.");
#endif
diff --git a/testcases/kernel/security/cap_bound/cap_bounds_rw.c b/testcases/kernel/security/cap_bound/cap_bounds_rw.c
index 9129c4e..827a305 100644
--- a/testcases/kernel/security/cap_bound/cap_bounds_rw.c
+++ b/testcases/kernel/security/cap_bound/cap_bounds_rw.c
@@ -31,21 +31,6 @@
#include <sys/prctl.h>
#include <test.h>
-#ifndef CAP_LAST_CAP
-#warning out-of-date capability.h does not define CAP_LAST_CAP
-#define CAP_LAST_CAP 28 /* be ultra-conservative */
-#endif
-
-#ifndef CAP_BSET_READ
-#warning CAP_BSET_READ not defined
-#define CAP_BSET_READ 23
-#endif
-
-#ifndef CAP_BSET_DROP
-#warning CAP_BSET_DROP not defined
-#define CAP_BSET_DROP 24
-#endif
-
char *TCID = "cap_bounds_rw";
int TST_TOTAL=1;
@@ -57,7 +42,12 @@ int check_remaining_caps(int lastdropped)
int ret;
for (i=0; i <= lastdropped; i++) {
- ret = prctl(CAP_BSET_READ, i);
+#if HAVE_DECL_PR_CAPBSET_READ
+ ret = prctl(PR_CAPBSET_READ, i);
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret == -1) {
tst_resm(TBROK, "Failed to read bounding set during sanity check\n");
tst_exit();
@@ -68,7 +58,12 @@ int check_remaining_caps(int lastdropped)
}
}
for (; i<=CAP_LAST_CAP; i++) {
- ret = prctl(CAP_BSET_READ, i);
+#if HAVE_DECL_PR_CAPBSET_READ
+ ret = prctl(PR_CAPBSET_READ, i);
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret == -1) {
tst_resm(TBROK, "Failed to read bounding set during sanity check\n");
tst_exit();
@@ -86,9 +81,14 @@ int main(int argc, char *argv[])
int ret = 1;
int i;
- ret = prctl(CAP_BSET_DROP, -1);
+#if HAVE_DECL_PR_CAPBSET_DROP
+ ret = prctl(PR_CAPBSET_READ, -1);
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret != -1) {
- tst_resm(TFAIL, "prctl(CAP_BSET_DROP, -1) returned %d\n", ret);
+ tst_resm(TFAIL, "prctl(PR_CAPBSET_DROP, -1) returned %d\n", ret);
tst_exit();
}
/* Ideally I'd check CAP_LAST_CAP+1, but userspace
@@ -97,16 +97,26 @@ int main(int argc, char *argv[])
* testing... So let's take an insanely high value */
#define INSANE 63
#define max(x,y) (x > y ? x : y)
- ret = prctl(CAP_BSET_DROP, max(INSANE,CAP_LAST_CAP+1));
+#if HAVE_DECL_PR_CAPBSET_DROP
+ ret = prctl(PR_CAPBSET_DROP, max(INSANE,CAP_LAST_CAP+1));
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret != -1) {
- tst_resm(TFAIL, "prctl(CAP_BSET_DROP, %d) returned %d\n", max(INSANE, CAP_LAST_CAP+1), ret);
+ tst_resm(TFAIL, "prctl(PR_CAPBSET_DROP, %d) returned %d\n", max(INSANE, CAP_LAST_CAP+1), ret);
tst_resm(TINFO, " %d is should not exist\n", max(INSANE, CAP_LAST_CAP+1));
tst_exit();
}
for (i=0; i<=CAP_LAST_CAP; i++) {
- ret = prctl(CAP_BSET_DROP, i);
+#if HAVE_DECL_PR_CAPBSET_DROP
+ ret = prctl(PR_CAPBSET_DROP, i);
+#else
+ errno = ENOSYS;
+ ret = -1;
+#endif
if (ret != 0) {
- tst_resm(TFAIL, "prctl(CAP_BSET_DROP, %d) returned %d\n", i, ret);
+ tst_resm(TFAIL, "prctl(PR_CAPBSET_DROP, %d) returned %d\n", i, ret);
if (ret == -1)
tst_resm(TINFO, "errno was %d\n", errno);
tst_exit();
@@ -122,6 +132,6 @@ int main(int argc, char *argv[])
tst_exit();
}
}
- tst_resm(TPASS, "CAP_BSET_DROP tests passed\n");
+ tst_resm(TPASS, "PR_CAPBSET_DROP tests passed\n");
tst_exit();
}
diff --git a/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c b/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c
index 894e0a5..c6c34c0 100644
--- a/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c
+++ b/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c
@@ -39,9 +39,11 @@ int TST_TOTAL=2;
int errno;
+#if HAVE_SYS_CAPABILITY_H
+#if HAVE_DECL_PR_CAPBSET_READ && HAVE_DECL_PR_CAPBSET_DROP
+#ifdef HAVE_LIBCAP
int main(int argc, char *argv[])
{
-#if HAVE_SYS_CAPABILITY_H
int ret = 1;
cap_value_t v[1];
cap_flag_value_t f;
@@ -49,12 +51,7 @@ int main(int argc, char *argv[])
/* We pick a random capability... let's use CAP_SYS_ADMIN */
/* make sure we have the capability now */
-#if HAVE_DECL_CAP_BSET_READ
- ret = prctl(CAP_BSET_READ, CAP_SYS_ADMIN);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
+ ret = prctl(PR_CAPBSET_READ, CAP_SYS_ADMIN);
if (ret != 1) {
tst_resm(TBROK, "Not starting with CAP_SYS_ADMIN\n");
tst_exit();
@@ -66,47 +63,23 @@ int main(int argc, char *argv[])
tst_resm(TBROK, "Failed to create cap_sys_admin+i cap_t (errno %d)\n", errno);
tst_exit();
}
-#if HAVE_DECL_CAP_SET_PROC
ret = cap_set_proc(cur);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
if (ret) {
tst_resm(TBROK, "Failed to cap_set_proc with cap_sys_admin+i (ret %d errno %d)\n",
ret, errno);
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
-#if HAVE_DECL_CAP_GET_FLAG
-#if HAVE_DECL_CAP_GET_PROC
cur = cap_get_proc();
ret = cap_get_flag(cur, CAP_SYS_ADMIN, CAP_INHERITABLE, &f);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
if (ret || f != CAP_SET) {
tst_resm(TBROK, "Failed to add CAP_SYS_ADMIN to pI\n");
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
/* drop the capability from bounding set */
-#if HAVE_DECL_CAP_BSET_DROP
- ret = prctl(CAP_BSET_DROP, CAP_SYS_ADMIN);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
+ ret = prctl(PR_CAPBSET_DROP, CAP_SYS_ADMIN);
if (ret) {
tst_resm(TFAIL, "Failed to drop CAP_SYS_ADMIN from bounding set.\n");
tst_resm(TINFO, "(ret=%d, errno %d)\n", ret, errno);
@@ -114,18 +87,8 @@ int main(int argc, char *argv[])
}
/* test 1: is CAP_SYS_ADMIN still in pI? */
-#if HAVE_DECL_CAP_GET_FLAG
-#if HAVE_DECL_CAP_GET_PROC
cur = cap_get_proc();
ret = cap_get_flag(cur, CAP_SYS_ADMIN, CAP_INHERITABLE, &f);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
if (ret || f != CAP_SET) {
tst_resm(TFAIL, "CAP_SYS_ADMIN not in pI after dropping from bounding set\n");
tst_exit();
@@ -144,24 +107,24 @@ int main(int argc, char *argv[])
tst_resm(TFAIL, "Failed to drop CAP_SYS_ADMIN from pI\n");
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(tmpcap);
-#endif
/* test 2: can we put it back in pI? */
-#if HAVE_DECL_CAP_SET_PROC
ret = cap_set_proc(cur);
-#endif
if (ret == 0) { /* success means pI was not bounded by X */
tst_resm(TFAIL, "Managed to put CAP_SYS_ADMIN back into pI though not in X\n");
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
tst_resm(TPASS, "Couldn't put CAP_SYS_ADMIN back into pI when not in bounding set\n");
-#else
+#else /* HAVE_LIBCAP */
tst_resm(TCONF, "System doesn't have POSIX capabilities.");
#endif
+#else /* HAVE_DECL_PR_CAPBSET_READ && HAVE_DECL_PR_CAPBSET_DROP */
+ tst_resm(TCONF, "System doesn't have CAPBSET prctls.");
+#endif
+#else /* HAVE_SYS_CAPABILITY_H */
+ tst_resm(TCONF, "System doesn't have sys/capability.h.");
+#endif
tst_exit();
}
diff --git a/testcases/kernel/security/cap_bound/check_pe.c b/testcases/kernel/security/cap_bound/check_pe.c
index 2e0451a..f621e70 100644
--- a/testcases/kernel/security/cap_bound/check_pe.c
+++ b/testcases/kernel/security/cap_bound/check_pe.c
@@ -40,9 +40,10 @@ int TST_TOTAL=1;
int errno;
+#if HAVE_SYS_CAPABILITY_H
+#ifdef HAVE_LIBCAP
int main(int argc, char *argv[])
{
-#if HAVE_SYS_CAPABILITY_H
int ret = 1;
cap_flag_value_t f;
cap_t cur;
@@ -58,26 +59,14 @@ int main(int argc, char *argv[])
tst_exit();
}
-#if HAVE_DECL_CAP_GET_FLAG
-#if HAVE_DECL_CAP_GET_PROC
cur = cap_get_proc();
ret = cap_get_flag(cur, CAP_SYS_ADMIN, CAP_EFFECTIVE, &f);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
if (ret) {
tst_resm(TBROK, "cap_get_flag failed (errno %d)\n", errno);
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
if (n == 1) {
if (f == CAP_SET) {
tst_resm(TPASS, "cap is in pE\n");
@@ -91,8 +80,11 @@ int main(int argc, char *argv[])
tst_exit();
}
tst_resm(TFAIL, "Cap is in pE\n");
-#else
+#else /* libcap */
tst_resm(TCONF, "System doesn't have POSIX capabilities.");
#endif
+#else /* capability_h */
+ tst_resm(TCONF, "System doesn't have sys/capability.h");
+#endif
tst_exit();
}
diff --git a/testcases/kernel/security/cap_bound/dummy.c b/testcases/kernel/security/cap_bound/dummy.c
index ad65007..e882940 100644
--- a/testcases/kernel/security/cap_bound/dummy.c
+++ b/testcases/kernel/security/cap_bound/dummy.c
@@ -5,31 +5,21 @@
#include <sys/capability.h>
#endif
-#define END \
- printf("System doesn't support POSIX capabilities.\n"); \
- return 1
-
int main()
{
#if HAVE_SYS_CAPABILITY_H
+#ifdef HAVE_LIBCAP
cap_t cur;
-#if HAVE_DECL_CAP_SET_PROC
-#if HAVE_DECL_CAP_FROM_TEXT
cur = cap_from_text("all=eip");
cap_set_proc(cur);
-#else
- END;
-#endif
-#else
- END;
-#endif
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#else
- END;
+ return 0;
+#else /* libcap */
+ printf("System doesn't support POSIX capabilities.\n");
+ return 1;
#endif
-#else
- END;
+#else /* capability_h */
+ printf("System doesn't support sys/capability.h\n");
+ return 1;
#endif
- return 0;
}
diff --git a/testcases/kernel/security/cap_bound/exec_with_inh.c b/testcases/kernel/security/cap_bound/exec_with_inh.c
index 21c60fd..123f665 100644
--- a/testcases/kernel/security/cap_bound/exec_with_inh.c
+++ b/testcases/kernel/security/cap_bound/exec_with_inh.c
@@ -42,59 +42,34 @@ int errno;
int main(int argc, char *argv[])
{
#if HAVE_SYS_CAPABILITY_H
+#ifdef HAVE_LIBCAP
int ret = 1;
cap_flag_value_t f;
cap_t cur = 0;
/* Make sure CAP_SYS_ADMIN is in pI */
-#if HAVE_DECL_CAP_FROM_TEXT
cur = cap_from_text("all=eip");
-#endif
if (!cur) {
tst_resm(TBROK, "Failed to create cap_sys_admin+i cap_t (errno %d)\n", errno);
tst_exit();
}
-#if HAVE_DECL_CAP_SET_PROC
ret = cap_set_proc(cur);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
if (ret) {
tst_resm(TBROK, "Failed to cap_set_proc with cap_sys_admin+i (ret %d errno %d)\n",
ret, errno);
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
-#if HAVE_DECL_CAP_GET_FLAG
-#if HAVE_DECL_CAP_GET_PROC
cur = cap_get_proc();
ret = cap_get_flag(cur, CAP_SYS_ADMIN, CAP_INHERITABLE, &f);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
if (ret || f != CAP_SET) {
tst_resm(TBROK, "Failed to add CAP_SYS_ADMIN to pI\n");
tst_exit();
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
/* drop the capability from bounding set */
-#if HAVE_DECL_CAP_BSET_DROP
- ret = prctl(CAP_BSET_DROP, CAP_SYS_ADMIN);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
+ ret = prctl(PR_CAPBSET_DROP, CAP_SYS_ADMIN);
if (ret) {
tst_resm(TFAIL, "Failed to drop CAP_SYS_ADMIN from bounding set.\n");
tst_resm(TINFO, "(ret=%d, errno %d)\n", ret, errno);
@@ -104,8 +79,11 @@ int main(int argc, char *argv[])
/* execute "check_pe 1" */
execl("check_pe", "check_pe", "1", NULL);
tst_resm(TBROK, "Failed to execute check_pe (errno %d)\n", errno);
-#else
+#else /* HAVE_LIBCAP */
tst_resm(TCONF, "System doesn't have POSIX capabilities.");
#endif
+#else /* HAVE_SYS_CAPABILITY_H */
+ tst_resm(TCONF, "System doesn't have sys/capability.h.");
+#endif
tst_exit();
}
diff --git a/testcases/kernel/security/cap_bound/exec_without_inh.c b/testcases/kernel/security/cap_bound/exec_without_inh.c
index 81216f3..df3c4d9 100644
--- a/testcases/kernel/security/cap_bound/exec_without_inh.c
+++ b/testcases/kernel/security/cap_bound/exec_without_inh.c
@@ -42,39 +42,20 @@ int errno;
int main(int argc, char *argv[])
{
#if HAVE_SYS_CAPABILITY_H
+#ifdef HAVE_LIBCAP
int ret = 1;
cap_flag_value_t f;
cap_value_t v[1];
cap_t cur;
/* Make sure CAP_SYS_ADMIN is not in pI */
-#if HAVE_DECL_CAP_GET_FLAG
-#if HAVE_DECL_CAP_GET_PROC
cur = cap_get_proc();
ret = cap_get_flag(cur, CAP_SYS_ADMIN, CAP_INHERITABLE, &f);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
if (f == CAP_SET) {
v[0] = CAP_SYS_ADMIN;
-#if HAVE_DECL_CAP_SET_FLAG
ret = cap_set_flag(cur, CAP_INHERITABLE, 1, v, CAP_CLEAR);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
-#if HAVE_DECL_CAP_SET_PROC
if (!ret)
ret = cap_set_proc(cur);
-#else
- ret = -1;
- errno = ENOSYS;
-#endif
if (ret) {
tst_resm(TBROK, "Failed to drop cap_sys_admin from pI\n");
tst_exit();
@@ -83,17 +64,10 @@ int main(int argc, char *argv[])
tst_brkm(TBROK | TERRNO, tst_exit, "Failed to add \
CAP_SYS_ADMIN to pI");
}
-#if HAVE_DECL_CAP_FREE
cap_free(cur);
-#endif
/* drop the capability from bounding set */
-#if HAVE_DECL_CAP_BSET_DROP
- ret = prctl(CAP_BSET_DROP, CAP_SYS_ADMIN);
-#else
- errno = ENOSYS;
- ret = -1;
-#endif
+ ret = prctl(PR_CAPBSET_DROP, CAP_SYS_ADMIN);
if (ret) {
tst_resm(TFAIL, "Failed to drop CAP_SYS_ADMIN from bounding set.\n");
tst_resm(TINFO, "(ret=%d, errno %d)\n", ret, errno);
@@ -103,8 +77,11 @@ int main(int argc, char *argv[])
/* execute "check_pe 0" */
execl("check_pe", "check_pe", "0", NULL);
tst_resm(TBROK, "Failed to execute check_pe (errno %d)\n", errno);
-#else
+#else /* libcap */
tst_resm(TCONF, "System doesn't have POSIX capabilities.");
#endif
+#else /* capability_h */
+ tst_resm(TCONF, "System doesn't have sys/capability.h.");
+#endif
tst_exit();
}
diff --git a/testcases/kernel/security/filecaps/c.c b/testcases/kernel/security/filecaps/c.c
new file mode 100644
index 0000000..5e1696c
--- /dev/null
+++ b/testcases/kernel/security/filecaps/c.c
@@ -0,0 +1,45 @@
+/******************************************************************************/
+/* */
+/* Copyright (c) International Business Machines Corp., 2008 */
+/* */
+/* This program is free software; you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation; either version 2 of the License, or */
+/* (at your option) any later version. */
+/* */
+/* This program is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */
+/* the GNU General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program; if not, write to the Free Software */
+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/******************************************************************************/
+
+
+#include <stdio.h>
+#include <sys/capability.h>
+
+int main()
+{
+
+#ifdef HAVE_LIBCAP
+ cap_t caps, caps2;
+ int ret;
+
+ caps = cap_from_text("cap_setpcap+ep");
+ caps2 = cap_from_text("cap_setpcap+ep");
+ ret = cap_set_proc(caps);
+ ret = cap_compare(caps, caps2);
+ printf("Caps were %sthe same\n", ret ? "not " : "");
+
+ cap_free(caps);
+ cap_free(caps2);
+ return ret;
+#else
+ printf("System doesn't support full POSIX capabilities.\n");
+ return 1;
+#endif
+}
diff --git a/testcases/kernel/security/filecaps/check_simple_capset.c b/testcases/kernel/security/filecaps/check_simple_capset.c
index 7851e01..6c7790d 100644
--- a/testcases/kernel/security/filecaps/check_simple_capset.c
+++ b/testcases/kernel/security/filecaps/check_simple_capset.c
@@ -27,28 +27,21 @@
int main()
{
-#if HAVE_SYS_CAPABILITY_H
+#ifdef HAVE_LIBCAP
cap_t caps, caps2;
int ret;
-#if HAVE_DECL_CAP_FROM_TEXT && HAVE_DECL_CAP_SET_PROC && HAVE_DECL_CAP_COMPARE
caps = cap_from_text("cap_setpcap+ep");
caps2 = cap_from_text("cap_setpcap+ep");
ret = cap_set_proc(caps);
ret = cap_compare(caps, caps2);
-#else
- printf("System doesn't support full POSIX capabilities.\n");
- return 1;
-#endif
printf("Caps were %sthe same\n", ret ? "not " : "");
-#if HAVE_DECL_CAP_FREE
cap_free(caps);
cap_free(caps2);
-#endif
return ret;
#else
- printf("System doesn't support POSIX capabilities.\n");
+ printf("System doesn't support full POSIX capabilities.\n");
return 1;
#endif
}
diff --git a/testcases/kernel/security/filecaps/checkforfilecaps.sh b/testcases/kernel/security/filecaps/checkforfilecaps.sh
deleted file mode 100755
index 757d409..0000000
--- a/testcases/kernel/security/filecaps/checkforfilecaps.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2008 ##
-## ##
-## This program is free software; you can redistribute it and#or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## This program is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
-## for more details. ##
-## ##
-## You should have received a copy of the GNU General Public License ##
-## along with this program; if not, write to the Free Software ##
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##
-## ##
-################################################################################
-
-if ! check_simple_capset; then
- echo Posix capabilities not compiled into the kernel. Please
- echo modprobe capability or recompile your kernel with
- echo CONFIG_SECURITY_CAPABILITIES=y.
- exit 1
-fi
-
-touch testme
-setcap cap_sys_admin=ip testme
-ret=$?
-rm -f testme
-if [ $ret -ne 0 ]; then
- echo File capabilities not compiled into kernel. Please
- echo make sure your kernel is compiled with
- echo CONFIG_SECURITY_FILE_CAPABILITIES=y.
- exit 1
-fi
-
-exit 0
diff --git a/testcases/kernel/security/filecaps/checkforlibcap.sh b/testcases/kernel/security/filecaps/checkforlibcap.sh
deleted file mode 100755
index cc7642e..0000000
--- a/testcases/kernel/security/filecaps/checkforlibcap.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2008 ##
-## ##
-## This program is free software; you can redistribute it and#or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## This program is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
-## for more details. ##
-## ##
-## You should have received a copy of the GNU General Public License ##
-## along with this program; if not, write to the Free Software ##
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##
-## ##
-################################################################################
-
-if [ "x$CC" = "x" ]; then
- export CC=gcc
-fi
-yesno=0
-if [ "$1" = "yesno" ]; then
- yesno=1
-fi
-
-SETCAP=`which setcap`
-if [ -z "${SETCAP}" ]; then
- ret=1
-else
- ret=0
-fi
-
-if [ $ret -eq 0 ]; then
- #also test for -lcap
- $CC -o check_simple_capset check_simple_capset.c -lcap \
- 2>/dev/null
-
- ret=$?
-fi
-
-if [ $ret -eq 0 ]; then
- #also test for xattr
- $CC -o check_xattr check_xattr.c
- ret=$?
- if [ $ret -ne 0 ]; then
- echo "Please install xattr headers"
- fi
-fi
-
-if [ $ret -ne 0 ]; then
- if [ $yesno -eq 1 ]; then
- echo no
- else
- exit 1
- fi
-else
- if [ $yesno -eq 1 ]; then
- echo yes
- else
- exit 0
- fi
-fi
diff --git a/testcases/kernel/security/filecaps/filecapstest.sh b/testcases/kernel/security/filecaps/filecapstest.sh
index 149cbc1..43582dc 100755
--- a/testcases/kernel/security/filecaps/filecapstest.sh
+++ b/testcases/kernel/security/filecaps/filecapstest.sh
@@ -19,23 +19,9 @@
## ##
################################################################################
-checkforlibcap.sh
-ret=$?
-if [ $ret -ne 0 ]; then
- echo "Filecaps 0 CONF : System doesn't support execution of the test"
- echo setcap not installed. Please install libcap-2.11 or newer from
- echo ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2
- exit 0
-fi
-checkforfilecaps.sh
-ret=$?
-if [ $ret -ne 0 ]; then
- echo "Filecaps 0 CONF : File capabilities not available"
- exit 0
-fi
-
echo "Running in:"
-cp $LTPROOT/testcases/bin/print_caps .
+#rm -f print_caps
+#cp $LTPROOT/testcases/bin/print_caps .
mkfifo caps_fifo
chmod 777 caps_fifo
exit_code=0
@@ -60,4 +46,5 @@ if [ $tmp -ne 0 ]; then
exit_code=$tmp
fi
+unlink caps_fifo
exit $exit_code
diff --git a/testcases/kernel/security/filecaps/inh_capped.c b/testcases/kernel/security/filecaps/inh_capped.c
index 513fcb9..794e8b1 100644
--- a/testcases/kernel/security/filecaps/inh_capped.c
+++ b/testcases/kernel/security/filecaps/inh_capped.c
@@ -34,21 +34,17 @@
char *TCID = "filecaps";
int TST_TOTAL=1;
+#ifdef HAVE_LIBCAP
void debug_print_caps(char *when)
{
-#ifdef DEBUG
char buf[2000];
tst_resm(TINFO, "%s", when);
-#if HAVE_DECL_SET_CAP_TO_TEXT
snprintf(buf, 2000, "%s", cap_to_text(cap_get_proc(), NULL));
-#endif
tst_resm(TINFO, "%s", buf);
-#endif
}
int set_caps_from_text(char *capstr)
{
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_SET_CAP_SET_PROC && HAVE_DECL_SET_CAP_FREE
cap_t caps = cap_from_text(capstr);
int ret;
@@ -59,14 +55,12 @@ int set_caps_from_text(char *capstr)
ret = cap_set_proc(caps);
cap_free(caps);
return ret;
-#else
- return -1;
-#endif
}
+#endif
int main()
{
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_SET_CAPS_FROM_TEXT
+#ifdef HAVE_LIBCAP
int ret;
debug_print_caps("start");
diff --git a/testcases/kernel/security/filecaps/print_caps.c b/testcases/kernel/security/filecaps/print_caps.c
index 188856e..f0e9bce 100644
--- a/testcases/kernel/security/filecaps/print_caps.c
+++ b/testcases/kernel/security/filecaps/print_caps.c
@@ -40,7 +40,7 @@
int main(int argc, char *argv[])
{
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_CAP_FREE && HAVE_DECL_CAP_GET_PROC && HAVE_DECL_CAP_TO_TEXT
+#ifdef HAVE_LIBCAP
cap_t cap = cap_get_proc();
int fd;
int seqno = 0;
diff --git a/testcases/kernel/security/filecaps/verify_caps_exec.c b/testcases/kernel/security/filecaps/verify_caps_exec.c
index 16fcc0f..5250007 100644
--- a/testcases/kernel/security/filecaps/verify_caps_exec.c
+++ b/testcases/kernel/security/filecaps/verify_caps_exec.c
@@ -60,20 +60,18 @@ void usage(char *me)
#define DROP_PERMS 0
#define KEEP_PERMS 1
+#ifdef HAVE_LIBCAP
void print_my_caps()
{
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_CAP_FREE && HAVE_DECL_CAP_GET_PROC && HAVE_DECL_CAP_TO_TEXT
cap_t cap = cap_get_proc();
char *txt = cap_to_text(cap, NULL);
tst_resm(TINFO, "\ncaps are %s\n", txt);
cap_free(cap);
cap_free(txt);
-#endif
}
int drop_root(int keep_perms)
{
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_CAP_FREE && HAVE_DECL_CAP_FROM_TEXT && HAVE_DECL_CAP_SET_PROC
int ret;
if (keep_perms)
@@ -89,15 +87,11 @@ int drop_root(int keep_perms)
cap_set_proc(cap);
cap_free(cap);
}
-#else
- tst_resm(TCONF, "System doesn't have full POSIX capabilities support.\n");
-#endif
tst_exit();
}
int perms_test(void)
{
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_CAP_FREE && HAVE_DECL_CAP_SET_FILE
int ret;
cap_t cap;
@@ -118,9 +112,6 @@ int perms_test(void)
cap_free(cap);
return ret;
-#else
- return -1;
-#endif
}
#define FIFOFILE "caps_fifo"
@@ -160,7 +151,6 @@ void read_from_fifo(char *buf)
close(fd);
}
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_CAP_COMPARE && HAVE_DECL_CAP_FREE && HAVE_DECL_CAP_TO_TEXT
int fork_drop_and_exec(int keepperms, cap_t expected_caps)
{
@@ -219,12 +209,9 @@ int fork_drop_and_exec(int keepperms, cap_t expected_caps)
}
return ret;
}
-#endif
int caps_actually_set_test(void)
{
-
-#if HAVE_SYS_CAPABILITY_H && HAVE_DECL_PR_CAPBSET_READ
int whichcap, finalret = 0, ret;
cap_t fcap, pcap, cap_fullpi;
cap_value_t capvalue[1];
@@ -399,17 +386,15 @@ int caps_actually_set_test(void)
cap_free(cap_fullpi);
return finalret;
-#else
- return -1;
-#endif
}
+#endif
int main(int argc, char *argv[])
{
+#ifdef HAVE_LIBCAP
if (argc < 2)
usage(argv[0]);
-#if HAVE_SYS_CAPABILITY_H
int ret = 0;
switch(atoi(argv[1])) {
diff --git a/testcases/network/multicast/mc_cmds/mc_cmds b/testcases/network/multicast/mc_cmds/mc_cmds
index d537103..f43dd95 100755
--- a/testcases/network/multicast/mc_cmds/mc_cmds
+++ b/testcases/network/multicast/mc_cmds/mc_cmds
@@ -127,7 +127,7 @@ for eth in $IFNAME
cat /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts | grep 1 > /dev/null
if [ $? -eq 0 ]
then
- end_testcase "Multicast ping disabled on this system (this is normal on post 2005 kernels)"
+ end_testcase "Multicast ping disabled on this system (this is normal on post year:2005 kernels)"
fi
# Do the ping tests: Execute ping 224.0.0.1 - Verify that the proper
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/1-1.c
index 767f1b0..c0746c0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/1-1.c
@@ -10,9 +10,7 @@
* This test case will call sem_getvalue to update the location referenced
* by the semaphpre without effecting the state of the semaphore. The
* updated value represents the actual semaphore value when it was called.
-*/
-
-
+ */
#include <stdio.h>
#include <errno.h>
@@ -20,29 +18,29 @@
#include <semaphore.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <limits.h>
#include "posixtest.h"
#define TEST "1-1"
#define FUNCTION "sem_getvalue"
#define ERROR_PREFIX "unexpected error: " FUNCTION " " TEST ": "
-
-int main() {
-
- char semname[28];
+int main(void)
+{
+ char semname[NAME_MAX - 4];
sem_t *mysemp;
int val;
- sprintf(semname, "/" FUNCTION "_" TEST "_%d", getpid());
+ snprintf(semname, sizeof(semname), "/" FUNCTION "_" TEST "_%d", getpid());
mysemp = sem_open(semname, O_CREAT, 0777, 1);
- if( mysemp == SEM_FAILED || mysemp == NULL ) {
+ if (mysemp == SEM_FAILED || mysemp == NULL) {
perror(ERROR_PREFIX "sem_open");
return PTS_UNRESOLVED;
}
- if( sem_getvalue(mysemp, &val) == -1 ) {
+ if (sem_getvalue(mysemp, &val) == -1) {
perror(ERROR_PREFIX "sem_getvalue");
return PTS_UNRESOLVED;
}
@@ -50,7 +48,8 @@ int main() {
/*
printf("Current value is: %d\n", val);
*/
- if (val == 1 ) {
+
+ if (val == 1) {
puts("TEST PASSED");
sem_close(mysemp);
sem_unlink(semname);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-1.c
index ac19af8..06814fb 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-1.c
@@ -8,8 +8,7 @@
/*
* When semaphore is locked, then the value returned by sem_getvalue is zero.
-*/
-
+ */
#include <stdio.h>
#include <errno.h>
@@ -17,35 +16,35 @@
#include <semaphore.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <limits.h>
#include "posixtest.h"
#define TEST "2-1"
#define FUNCTION "sem_getvalue"
#define ERROR_PREFIX "unexpected error: " FUNCTION " " TEST ": "
-
-int main() {
-
- char semname[28];
+int main(void)
+{
+ char semname[NAME_MAX - 4];
sem_t *mysemp;
int val;
- sprintf(semname, "/" FUNCTION "_" TEST "_%d", getpid());
+ snprintf(semname, sizeof(semname), "/" FUNCTION "_" TEST "_%d", getpid());
mysemp = sem_open(semname, O_CREAT, 0777, 1);
- if( mysemp == SEM_FAILED || mysemp == NULL ) {
+ if (mysemp == SEM_FAILED || mysemp == NULL) {
perror(ERROR_PREFIX "sem_open");
return PTS_UNRESOLVED;
}
/* Lock Semaphore */
- if (sem_trywait(mysemp) == -1 ) {
+ if (sem_trywait(mysemp) == -1) {
perror(ERROR_PREFIX "trywait");
return PTS_UNRESOLVED;
}
- if( sem_getvalue(mysemp, &val) < 0 ) {
+ if (sem_getvalue(mysemp, &val) < 0) {
perror(ERROR_PREFIX "sem_getvalue");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-2.c
index 5918ceb..9989e48 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/2-2.c
@@ -83,18 +83,15 @@
/*************************** Test case ***********************************/
/******************************************************************************/
-void * threaded ( void * arg )
+void *threaded(void * arg)
{
int ret;
- do
- {
+ do {
ret = sem_wait( arg );
- }
- while ( ( ret != 0 ) && ( errno == EINTR ) );
+ } while (( ret != 0 ) && (errno == EINTR));
- if ( ret != 0 )
- {
+ if (ret != 0) {
UNRESOLVED( errno, "Failed to wait for the semaphore" );
}
@@ -103,7 +100,7 @@ void * threaded ( void * arg )
/* The main test function. */
-int main( int argc, char * argv[] )
+int main(int argc, char *argv[])
{
int ret, val;
sem_t sem;
@@ -113,71 +110,61 @@ int main( int argc, char * argv[] )
output_init();
/* Initialize semaphore */
- ret = sem_init( &sem, 0, 0 );
+ ret = sem_init(&sem, 0, 0);
- if ( ret != 0 )
- {
+ if (ret != 0) {
UNRESOLVED( errno, "Failed to init semaphore" );
}
/* Create the thread */
- ret = pthread_create( &th, NULL, threaded, &sem );
+ ret = pthread_create(&th, NULL, threaded, &sem);
- if ( ret != 0 )
- {
+ if (ret != 0) {
UNRESOLVED( ret, "Failed to create the thread" );
}
/* Sleep 1 sec so the thread enters the sem_wait call */
- sleep( 1 );
+ sleep(1);
/* Check value */
- ret = sem_getvalue( &sem, &val );
+ ret = sem_getvalue(&sem, &val);
- if ( ret != 0 )
- {
+ if (ret != 0) {
UNRESOLVED( errno, "Failed to get semaphore value" );
}
- if ( ( val != 0 ) && ( val != -1 ) )
- {
- output( "Val: %d\n", val );
- FAILED( "Semaphore count is neither 0 nor # of waiting processes" );
+ if ((val != 0) && (val != -1)) {
+ output("Val: %d\n", val );
+ FAILED("Semaphore count is neither 0 nor # of waiting processes");
}
/* Post the semaphore */
- ret = sem_post( &sem );
+ ret = sem_post(&sem);
- if ( ret != 0 )
- {
- UNRESOLVED( errno, "Failed to post the semaphore" );
+ if (ret != 0) {
+ UNRESOLVED(errno, "Failed to post the semaphore");
}
/* Join the thread */
- ret = pthread_join( th, NULL );
+ ret = pthread_join(th, NULL);
- if ( ret != 0 )
- {
+ if (ret != 0) {
UNRESOLVED( ret, "Failed to join the thread" );
}
-
/* Destroy the semaphore */
- ret = sem_destroy( &sem );
+ ret = sem_destroy(&sem);
- if ( ret != 0 )
- {
+ if (ret != 0) {
UNRESOLVED( errno, "Failed to sem_destroy" );
}
/* Test passed */
#if VERBOSE > 0
- output( "Test passed\n" );
+ output("Test passed\n");
#endif
PASSED;
}
-
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/4-1.c
index 0774acb..2507fd3 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/4-1.c
@@ -9,9 +9,7 @@
/*
* Upon successful completion of calling sem_getvalue, it shall return a value
* of zero.
-*/
-
-
+ */
#include <stdio.h>
#include <errno.h>
@@ -19,29 +17,29 @@
#include <semaphore.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <limits.h>
#include "posixtest.h"
#define TEST "4-1"
#define FUNCTION "sem_getvalue"
#define ERROR_PREFIX "unexpected error: " FUNCTION " " TEST ": "
-
-int main() {
-
- char semname[28];
+int main(void)
+{
+ char semname[NAME_MAX - 4];
sem_t *mysemp;
int val;
- sprintf(semname, "/" FUNCTION "_" TEST "_%d", getpid());
+ snprintf(semname, sizeof(semname), "/" FUNCTION "_" TEST "_%d", getpid());
mysemp = sem_open(semname, O_CREAT, 0777, 1);
- if( mysemp == SEM_FAILED || mysemp == NULL ) {
+ if (mysemp == SEM_FAILED || mysemp == NULL) {
perror(ERROR_PREFIX "sem_open");
return PTS_UNRESOLVED;
}
- if( sem_getvalue(mysemp, &val) != 0 ) {
+ if (sem_getvalue(mysemp, &val) != 0) {
puts("TEST FAILED");
return PTS_FAIL;
} else {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/5-1.c
index c77b19c..1f17f5f 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/5-1.c
@@ -9,8 +9,7 @@
/*
* This test case verifies that calling sem_getvalue doesn't change the
* state of the semaphore.
-*/
-
+ */
#include <stdio.h>
#include <errno.h>
@@ -18,40 +17,40 @@
#include <semaphore.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <limits.h>
#include "posixtest.h"
#define TEST "5-1"
#define FUNCTION "sem_getvalue"
#define ERROR_PREFIX "unexpected error: " FUNCTION " " TEST ": "
-
-int main() {
-
- char semname[20];
+int main(void)
+{
+ char semname[NAME_MAX - 4];
sem_t *mysemp;
int val;
- sprintf(semname, "/" FUNCTION "_" TEST "_%d", getpid());
+ snprintf(semname, sizeof(semname), "/" FUNCTION "_" TEST "_%d", getpid());
mysemp = sem_open(semname, O_CREAT, 0777, 4);
- if( mysemp == SEM_FAILED || mysemp == NULL ) {
+ if (mysemp == SEM_FAILED || mysemp == NULL) {
perror(ERROR_PREFIX "sem_open");
return PTS_UNRESOLVED;
}
- if( sem_getvalue(mysemp, &val) == -1 ) {
+ if (sem_getvalue(mysemp, &val) == -1) {
perror(ERROR_PREFIX "sem_getvalue");
return PTS_UNRESOLVED;
}
- if ( sem_trywait(mysemp) == -1 ) {
+ if (sem_trywait(mysemp) == -1) {
perror(ERROR_PREFIX "sem_trywait");
return PTS_UNRESOLVED;
}
- if( sem_getvalue(mysemp, &val) == -1 ) {
+ if (sem_getvalue(mysemp, &val) == -1) {
perror(ERROR_PREFIX "sem_getvalue");
return PTS_UNRESOLVED;
}
@@ -60,7 +59,7 @@ int main() {
printf("Current value is: %d\n", val);
*/
- if (val == 3 ) {
+ if (val == 3) {
puts("TEST PASSED");
sem_close(mysemp);
sem_unlink(semname);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c
index b2db995..86007b7 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c
@@ -161,7 +161,6 @@ int main()
}
fprintf(stderr, "P: child_1:%d forked\n", c_1);
- sleep(1);
c_2 = fork();
if (c_2 == 0)
{
@@ -198,6 +197,9 @@ int main()
//printf("val = %d\n", val);
} while (val != 0);
*/
+
+ /* Synchronization required before release the lock */
+ sleep(1);
/* Ok, let's release the lock */
fprintf(stderr, "P: release lock\n");
sem_post(sem);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigset/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sigset/8-1.c
index f344b19..22b1f40 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sigset/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sigset/8-1.c
@@ -15,12 +15,22 @@
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
#include "posixtest.h"
-int main()
+int main(void)
{
+ sigset_t st;
+ sigemptyset(&st);
+ sigaddset(&st, SIGCHLD);
- if (sigset(SIGCHLD,SIG_HOLD) != SIG_HOLD) {
+ if (sigprocmask(SIG_BLOCK, &st, NULL) < 0) {
+ printf("Test FAILED: sigprocmask(): %s\n", strerror(errno));
+ return PTS_FAIL;
+ }
+
+ if (sigset(SIGCHLD, SIG_HOLD) != SIG_HOLD) {
printf("Test FAILED: sigset() didn't return SIG_HOLD\n");
return PTS_FAIL;
}
hooks/post-receive
--
ltp
|
