OS-5122 lxbrand should tolerate cap_set_file

Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
TritonDataCenter · Jan 28, 2016 · 155110a · 155110a
1 parent 67304e3
commit 155110a
Show file tree

Hide file tree

Showing 4 changed files with 391 additions and 37 deletions.
diff --git a/usr/src/lib/brand/lx/testing/Readme_ltp b/usr/src/lib/brand/lx/testing/Readme_ltp
@@ -10,6 +10,9 @@ To build
 As root first make sure you have the tools installed:
     apt-get install build-essential autoconf automake git quota
 
+Additional prerequisites are required activate some tests:
+    apt-get install attr-dev libaio-dev
+
 As a normal user:
     git clone https://github.com/linux-test-project/ltp.git
     cd ltp
@@ -53,7 +56,7 @@ should show "Total Failures: 0". If not, something is wrong.
 Running tests for development
 -----------------------------
 The source for the tests can be found under the testcases directory. The
-largest and most useful set for lx live under testcases/kernel/syscalls. 
+largest and most useful set for lx live under testcases/kernel/syscalls.
 
 For development purposes, an individual test (or tests) can be run by listing
 them in a command file, one per line. For example, with a command file named
@@ -186,7 +189,7 @@ x mremap02
 x mremap03
 x mremap04
 x mremap05
-# msgctl12	uses MSG_STAT   
+# msgctl12	uses MSG_STAT
 # msgrcv07	MSG_EXCEPT subtest - not avail.
 x open01	need PRIV_SYS_CONFIG to set sticky bit on reg file
 # open02	expects NOATIME to cause err for unpriv user
@@ -209,7 +212,7 @@ x ptrace04	not supp on our arch
 - renameat01	needs dev
 - rmdir02	needs dev
 x sched_getparam01	assumes Linux SCHED_OTHER return value
-x sched_getparam02	assumes Linux SCHED_OTHER return value 
+x sched_getparam02	assumes Linux SCHED_OTHER return value
 # sched_rr_get_interval01
 # sched_rr_get_interval02
 # sched_rr_get_interval03
@@ -222,18 +225,18 @@ x sched_setaffinity01
 x sched_getaffinity01
 # semctl01	all pass but SEM_STAT - linux specific
 # semop02	last test fails errno - expensive
-# sendfile02	OS-3296  
+# sendfile02	OS-3296
 # sendfile02_64	"
 # sendfile04	"
 # sendfile04_64	"
 # sendfile06	"
 # sendfile06_64	"
 # sendfile07	"
 # sendfile07_64	"
-sendmsg01	OS-3295 - tests actually pass 
+sendmsg01	OS-3295 - tests actually pass
 x setfsuid04	no real equiv. and only for NFS server
 x setfsuid04_16
-# sgetmask01	obsolete   
+# sgetmask01	obsolete
 # setgroups04_16	expects sig11 for certain err
 # setns01
 # setns02
@@ -258,7 +261,7 @@ x switch01
 # sysconf01	most pass but see OS-3305
 # sysctl01	the build compiled this out,
 # sysctl03	this syscall is basically obsolete
-# sysctl04	obsolete 
+# sysctl04	obsolete
 # sysctl05
 # syslog01
 # syslog02
@@ -277,7 +280,7 @@ x switch01
 - umount01	needs dev
 - umount02	needs dev
 - umount03	needs dev
-x ustat01	obsolete call to stat FS   
+x ustat01	obsolete call to stat FS
 x ustat02	obsolete call to stat FS
 - utime06	needs dev
 - utimes01	needs dev

diff --git a/usr/src/uts/common/brand/lx/os/lx_syscall.c b/usr/src/uts/common/brand/lx/os/lx_syscall.c
@@ -842,18 +842,18 @@ lx_sysent_t lx_sysent32[] = {
 	{"security",	NULL,			NOSYS_NO_EQUIV,	0}, /* 223 */
 	{"gettid",	lx_gettid,		0,		0}, /* 224 */
 	{"readahead",	NULL,			NOSYS_NO_EQUIV,	0}, /* 225 */
-	{"setxattr",	lx_xattr,		0,		5}, /* 226 */
-	{"lsetxattr",	lx_xattr,		0,		5}, /* 227 */
-	{"fsetxattr",	lx_xattr,		0,		5}, /* 228 */
-	{"getxattr",	lx_xattr,		0,		4}, /* 229 */
-	{"lgetxattr",	lx_xattr,		0,		4}, /* 230 */
-	{"fgetxattr",	lx_xattr,		0,		4}, /* 231 */
-	{"listxattr",	lx_xattr,		0,		3}, /* 232 */
-	{"llistxattr",	lx_xattr,		0,		3}, /* 233 */
-	{"flistxattr",	lx_xattr,		0,		3}, /* 234 */
-	{"removexattr",	lx_xattr,		0,		2}, /* 235 */
-	{"lremovexattr", lx_xattr,		0,		2}, /* 236 */
-	{"fremovexattr", lx_xattr,		0,		2}, /* 237 */
+	{"setxattr",	lx_setxattr,		0,		5}, /* 226 */
+	{"lsetxattr",	lx_lsetxattr,		0,		5}, /* 227 */
+	{"fsetxattr",	lx_fsetxattr,		0,		5}, /* 228 */
+	{"getxattr",	lx_getxattr,		0,		4}, /* 229 */
+	{"lgetxattr",	lx_lgetxattr,		0,		4}, /* 230 */
+	{"fgetxattr",	lx_fgetxattr,		0,		4}, /* 231 */
+	{"listxattr",	lx_listxattr,		0,		3}, /* 232 */
+	{"llistxattr",	lx_llistxattr,		0,		3}, /* 233 */
+	{"flistxattr",	lx_flistxattr,		0,		3}, /* 234 */
+	{"removexattr",	lx_removexattr,		0,		2}, /* 235 */
+	{"lremovexattr", lx_lremovexattr,	0,		2}, /* 236 */
+	{"fremovexattr", lx_fremovexattr,	0,		2}, /* 237 */
 	{"tkill",	lx_tkill,		0,		2}, /* 238 */
 	{"sendfile64",	NULL,			0,		4}, /* 239 */
 	{"futex",	lx_futex,		LX_SYS_EBPARG6,	6}, /* 240 */
@@ -1175,18 +1175,18 @@ lx_sysent_t lx_sysent64[] = {
 	{"security",	NULL,			NOSYS_NO_EQUIV,	0}, /* 185 */
 	{"gettid",	lx_gettid,		0,		0}, /* 186 */
 	{"readahead",	NULL,			NOSYS_NO_EQUIV,	0}, /* 187 */
-	{"setxattr",	lx_xattr,		0,		5}, /* 188 */
-	{"lsetxattr",	lx_xattr,		0,		5}, /* 189 */
-	{"fsetxattr",	lx_xattr,		0,		5}, /* 190 */
-	{"getxattr",	lx_xattr,		0,		4}, /* 191 */
-	{"lgetxattr",	lx_xattr,		0,		4}, /* 192 */
-	{"fgetxattr",	lx_xattr,		0,		4}, /* 193 */
-	{"listxattr",	lx_xattr,		0,		3}, /* 194 */
-	{"llistxattr",	lx_xattr,		0,		3}, /* 195 */
-	{"flistxattr",	lx_xattr,		0,		3}, /* 196 */
-	{"removexattr",	lx_xattr,		0,		2}, /* 197 */
-	{"lremovexattr", lx_xattr,		0,		2}, /* 198 */
-	{"fremovexattr", lx_xattr,		0,		2}, /* 199 */
+	{"setxattr",	lx_setxattr,		0,		5}, /* 188 */
+	{"lsetxattr",	lx_lsetxattr,		0,		5}, /* 189 */
+	{"fsetxattr",	lx_fsetxattr,		0,		5}, /* 190 */
+	{"getxattr",	lx_getxattr,		0,		4}, /* 191 */
+	{"lgetxattr",	lx_lgetxattr,		0,		4}, /* 192 */
+	{"fgetxattr",	lx_fgetxattr,		0,		4}, /* 193 */
+	{"listxattr",	lx_listxattr,		0,		3}, /* 194 */
+	{"llistxattr",	lx_llistxattr,		0,		3}, /* 195 */
+	{"flistxattr",	lx_flistxattr,		0,		3}, /* 196 */
+	{"removexattr",	lx_removexattr,		0,		2}, /* 197 */
+	{"lremovexattr", lx_lremovexattr,	0,		2}, /* 198 */
+	{"fremovexattr", lx_fremovexattr,	0,		2}, /* 199 */
 	{"tkill",	lx_tkill,		0,		2}, /* 200 */
 	{"time",	lx_time,		0,		1}, /* 201 */
 	{"futex",	lx_futex,		0,		6}, /* 202 */

diff --git a/usr/src/uts/common/brand/lx/sys/lx_syscalls.h b/usr/src/uts/common/brand/lx/sys/lx_syscalls.h
@@ -59,6 +59,10 @@ extern long lx_fchown16();
 extern long lx_fchownat();
 extern long lx_fcntl();
 extern long lx_fcntl64();
+extern long lx_fgetxattr();
+extern long lx_flistxattr();
+extern long lx_fremovexattr();
+extern long lx_fsetxattr();
 extern long lx_fstat32();
 extern long lx_fstat64();
 extern long lx_fstatat64();
@@ -76,17 +80,23 @@ extern long lx_getrlimit();
 extern long lx_getsockopt();
 extern long lx_gettid();
 extern long lx_gettimeofday();
+extern long lx_getxattr();
 extern long lx_io_setup();
 extern long lx_ioctl();
 extern long lx_ioprio_get();
 extern long lx_ioprio_set();
 extern long lx_kill();
 extern long lx_lchown();
 extern long lx_lchown16();
+extern long lx_lgetxattr();
 extern long lx_link();
 extern long lx_linkat();
+extern long lx_llistxattr();
+extern long lx_lremovexattr();
+extern long lx_lsetxattr();
 extern long lx_lstat32();
 extern long lx_lstat64();
+extern long lx_listxattr();
 extern long lx_mkdir();
 extern long lx_mkdirat();
 extern long lx_modify_ldt();
@@ -129,6 +139,7 @@ extern long lx_setresgid16();
 extern long lx_setresuid();
 extern long lx_setresuid16();
 extern long lx_setrlimit();
+extern long lx_setxattr();
 extern long lx_setsockopt();
 extern long lx_socket();
 extern long lx_socketcall();
@@ -138,6 +149,7 @@ extern long lx_sync_file_range();
 extern long lx_syncfs();
 extern long lx_sysinfo32();
 extern long lx_sysinfo64();
+extern long lx_removexattr();
 extern long lx_tgkill();
 extern long lx_time();
 extern long lx_tkill();
@@ -147,7 +159,6 @@ extern long lx_waitid();
 extern long lx_waitpid();
 extern long lx_write();
 extern long lx_writev();
-extern long lx_xattr();
 
 #if defined(_LP64)
 /*