svn commit: r293533 - in stable/10/sys: amd64/linux amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sat Jan  9 16:21:39 2016
New Revision: 293533
URL: https://svnweb.freebsd.org/changeset/base/293533

Log:
  MFC r283428:
  
  Change linux faccessat syscall definition to match actual linux one.
  
  The AT_EACCESS and AT_SYMLINK_NOFOLLOW flags are actually implemented
  within the glibc wrapper function for faccessat().  If either of these
  flags are specified, then the wrapper function employs fstatat() to
  determine access permissions.

Modified:
  stable/10/sys/amd64/linux/syscalls.master
  stable/10/sys/amd64/linux32/syscalls.master
  stable/10/sys/compat/linux/linux_file.c
  stable/10/sys/i386/linux/syscalls.master
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/linux/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux/syscalls.master	Sat Jan  9 16:20:29 2016	(r293532)
+++ stable/10/sys/amd64/linux/syscalls.master	Sat Jan  9 16:21:39 2016	(r293533)
@@ -450,7 +450,7 @@
 268	AUE_FCHMODAT	STD	{ int linux_fchmodat(l_int dfd, const char *filename, \
 				    l_mode_t mode); }
 269	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, \
-				    l_int amode, l_int flag); }
+				    l_int amode); }
 270	AUE_SELECT	STD	{ int linux_pselect6(l_int nfds,			\
 				    l_fd_set *readfds, l_fd_set *writefds, l_fd_set *exceptfds,	\
 				    struct l_timespec *tsp, l_uintptr_t *sig); }

Modified: stable/10/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux32/syscalls.master	Sat Jan  9 16:20:29 2016	(r293532)
+++ stable/10/sys/amd64/linux32/syscalls.master	Sat Jan  9 16:21:39 2016	(r293533)
@@ -507,7 +507,8 @@
 					char *buf, l_int bufsiz); }
 306	AUE_FCHMODAT	STD	{ int linux_fchmodat(l_int dfd, const char *filename, \
 					l_mode_t mode); }
-307	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, l_int amode, int flag); }
+307	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, \
+					l_int amode); }
 308	AUE_SELECT	STD	{ int linux_pselect6(l_int nfds, l_fd_set *readfds,	\
 					l_fd_set *writefds, l_fd_set *exceptfds,	\
 					struct l_timespec *tsp, l_uintptr_t *sig); }

Modified: stable/10/sys/compat/linux/linux_file.c
==============================================================================
--- stable/10/sys/compat/linux/linux_file.c	Sat Jan  9 16:20:29 2016	(r293532)
+++ stable/10/sys/compat/linux/linux_file.c	Sat Jan  9 16:21:39 2016	(r293533)
@@ -580,10 +580,8 @@ int
 linux_faccessat(struct thread *td, struct linux_faccessat_args *args)
 {
 	char *path;
-	int error, dfd, flag;
+	int error, dfd;
 
-	if (args->flag & ~LINUX_AT_EACCESS)
-		return (EINVAL);
 	/* linux convention */
 	if (args->amode & ~(F_OK | X_OK | W_OK | R_OK))
 		return (EINVAL);
@@ -596,8 +594,7 @@ linux_faccessat(struct thread *td, struc
 		printf(ARGS(access, "%s, %d"), path, args->amode);
 #endif
 
-	flag = (args->flag & LINUX_AT_EACCESS) == 0 ? 0 : AT_EACCESS;
-	error = kern_accessat(td, dfd, path, UIO_SYSSPACE, flag, args->amode);
+	error = kern_accessat(td, dfd, path, UIO_SYSSPACE, 0, args->amode);
 	LFREEPATH(path);
 
 	return (error);

Modified: stable/10/sys/i386/linux/syscalls.master
==============================================================================
--- stable/10/sys/i386/linux/syscalls.master	Sat Jan  9 16:20:29 2016	(r293532)
+++ stable/10/sys/i386/linux/syscalls.master	Sat Jan  9 16:21:39 2016	(r293533)
@@ -515,7 +515,8 @@
 					char *buf, l_int bufsiz); }
 306	AUE_FCHMODAT	STD	{ int linux_fchmodat(l_int dfd, const char *filename, \
 					l_mode_t mode); }
-307	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, l_int amode, l_int flag); }
+307	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, \
+					l_int amode); }
 308	AUE_SELECT	STD	{ int linux_pselect6(l_int nfds, l_fd_set *readfds,	\
 					l_fd_set *writefds, l_fd_set *exceptfds,	\
 					struct l_timespec *tsp, l_uintptr_t *sig); }