Author: dchagin
Date: Sun Apr 28 14:34:31 2019
New Revision: 346842
URL: https://svnweb.freebsd.org/changeset/base/346842
Log:
MFC r345469, r345470:
Linux between 4.18 and 5.0 split IPC system calls.
In preparation for doing this in the Linuxulator modify our linux_shmat()
to match actual Linux shmat() system call.
Modified:
stable/12/sys/amd64/linux32/linux32_machdep.c
stable/12/sys/amd64/linux32/linux32_proto.h
stable/12/sys/amd64/linux32/linux32_systrace_args.c
stable/12/sys/amd64/linux32/syscalls.master
stable/12/sys/compat/linux/linux_ipc.c
stable/12/sys/compat/linux/linux_ipc.h
stable/12/sys/i386/linux/linux_machdep.c
stable/12/sys/i386/linux/linux_proto.h
stable/12/sys/i386/linux/linux_systrace_args.c
stable/12/sys/i386/linux/syscalls.master
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- stable/12/sys/amd64/linux32/linux32_machdep.c Sun Apr 28 14:30:25
2019 (r346841)
+++ stable/12/sys/amd64/linux32/linux32_machdep.c Sun Apr 28 14:34:31
2019 (r346842)
@@ -259,7 +259,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
struct linux_semop_args a;
a.semid = args->arg1;
- a.tsops = args->ptr;
+ a.tsops = PTRIN(args->ptr);
a.nsops = args->arg2;
return (linux_semop(td, &a));
}
@@ -278,7 +278,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
a.semid = args->arg1;
a.semnum = args->arg2;
a.cmd = args->arg3;
- error = copyin(args->ptr, &a.arg, sizeof(a.arg));
+ error = copyin(PTRIN(args->ptr), &a.arg, sizeof(a.arg));
if (error)
return (error);
return (linux_semctl(td, &a));
@@ -287,7 +287,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
struct linux_msgsnd_args a;
a.msqid = args->arg1;
- a.msgp = args->ptr;
+ a.msgp = PTRIN(args->ptr);
a.msgsz = args->arg2;
a.msgflg = args->arg3;
return (linux_msgsnd(td, &a));
@@ -304,13 +304,13 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
if (args->ptr == 0)
return (EINVAL);
- error = copyin(args->ptr, &tmp, sizeof(tmp));
+ error = copyin(PTRIN(args->ptr), &tmp, sizeof(tmp));
if (error)
return (error);
a.msgp = PTRIN(tmp.msgp);
a.msgtyp = tmp.msgtyp;
} else {
- a.msgp = args->ptr;
+ a.msgp = PTRIN(args->ptr);
a.msgtyp = args->arg5;
}
return (linux_msgrcv(td, &a));
@@ -327,22 +327,29 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
a.msqid = args->arg1;
a.cmd = args->arg2;
- a.buf = args->ptr;
+ a.buf = PTRIN(args->ptr);
return (linux_msgctl(td, &a));
}
case LINUX_SHMAT: {
struct linux_shmat_args a;
+ l_uintptr_t addr;
+ int error;
a.shmid = args->arg1;
- a.shmaddr = args->ptr;
+ a.shmaddr = PTRIN(args->ptr);
a.shmflg = args->arg2;
- a.raddr = PTRIN((l_uint)args->arg3);
- return (linux_shmat(td, &a));
+ error = linux_shmat(td, &a);
+ if (error != 0)
+ return (error);
+ addr = td->td_retval[0];
+ error = copyout(&addr, PTRIN(args->arg3), sizeof(addr));
+ td->td_retval[0] = 0;
+ return (error);
}
case LINUX_SHMDT: {
struct linux_shmdt_args a;
- a.shmaddr = args->ptr;
+ a.shmaddr = PTRIN(args->ptr);
return (linux_shmdt(td, &a));
}
case LINUX_SHMGET: {
@@ -358,7 +365,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
a.shmid = args->arg1;
a.cmd = args->arg2;
- a.buf = args->ptr;
+ a.buf = PTRIN(args->ptr);
return (linux_shmctl(td, &a));
}
default:
Modified: stable/12/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/12/sys/amd64/linux32/linux32_proto.h Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/amd64/linux32/linux32_proto.h Sun Apr 28 14:34:31 2019
(r346842)
@@ -369,9 +369,9 @@ struct linux_ipc_args {
char what_l_[PADL_(l_uint)]; l_uint what; char what_r_[PADR_(l_uint)];
char arg1_l_[PADL_(l_int)]; l_int arg1; char arg1_r_[PADR_(l_int)];
char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)];
- char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)];
- char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
- char arg5_l_[PADL_(l_long)]; l_long arg5; char arg5_r_[PADR_(l_long)];
+ char arg3_l_[PADL_(l_uint)]; l_uint arg3; char arg3_r_[PADR_(l_uint)];
+ char ptr_l_[PADL_(l_uintptr_t)]; l_uintptr_t ptr; char
ptr_r_[PADR_(l_uintptr_t)];
+ char arg5_l_[PADL_(l_uint)]; l_uint arg5; char arg5_r_[PADR_(l_uint)];
};
struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
Modified: stable/12/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- stable/12/sys/amd64/linux32/linux32_systrace_args.c Sun Apr 28 14:30:25
2019 (r346841)
+++ stable/12/sys/amd64/linux32/linux32_systrace_args.c Sun Apr 28 14:34:31
2019 (r346842)
@@ -785,9 +785,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->what; /* l_uint */
iarg[1] = p->arg1; /* l_int */
iarg[2] = p->arg2; /* l_int */
- iarg[3] = p->arg3; /* l_int */
- uarg[4] = (intptr_t) p->ptr; /* void * */
- iarg[5] = p->arg5; /* l_long */
+ iarg[3] = p->arg3; /* l_uint */
+ iarg[4] = p->ptr; /* l_uintptr_t */
+ iarg[5] = p->arg5; /* l_uint */
*n_args = 6;
break;
}
@@ -3894,13 +3894,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 3:
- p = "l_int";
+ p = "l_uint";
break;
case 4:
- p = "userland void *";
+ p = "l_uintptr_t";
break;
case 5:
- p = "l_long";
+ p = "l_uint";
break;
default:
break;
Modified: stable/12/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/12/sys/amd64/linux32/syscalls.master Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/amd64/linux32/syscalls.master Sun Apr 28 14:34:31 2019
(r346842)
@@ -212,8 +212,8 @@
115 AUE_SWAPOFF STD { int linux_swapoff(void); }
116 AUE_NULL STD { int linux_sysinfo(struct l_sysinfo *info); }
117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \
- l_int arg2, l_int arg3, void *ptr, \
- l_long arg5); }
+ l_int arg2, l_uint arg3, l_uintptr_t ptr, \
+ l_uint arg5); }
118 AUE_FSYNC NOPROTO { int fsync(int fd); }
119 AUE_SIGRETURN STD { int linux_sigreturn( \
struct l_sigframe *sfp); }
Modified: stable/12/sys/compat/linux/linux_ipc.c
==============================================================================
--- stable/12/sys/compat/linux/linux_ipc.c Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/compat/linux/linux_ipc.c Sun Apr 28 14:34:31 2019
(r346842)
@@ -785,23 +785,11 @@ linux_shmat(struct thread *td, struct linux_shmat_args
void *shmaddr;
int shmflg;
} */ bsd_args;
- int error;
-#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32))
- l_uintptr_t addr;
-#endif
bsd_args.shmid = args->shmid;
bsd_args.shmaddr = PTRIN(args->shmaddr);
bsd_args.shmflg = args->shmflg;
- if ((error = sys_shmat(td, &bsd_args)))
- return (error);
-#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32))
- addr = td->td_retval[0];
- if ((error = copyout(&addr, PTRIN(args->raddr), sizeof(addr))))
- return (error);
- td->td_retval[0] = 0;
-#endif
- return (0);
+ return (sys_shmat(td, &bsd_args));
}
int
Modified: stable/12/sys/compat/linux/linux_ipc.h
==============================================================================
--- stable/12/sys/compat/linux/linux_ipc.h Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/compat/linux/linux_ipc.h Sun Apr 28 14:34:31 2019
(r346842)
@@ -141,7 +141,6 @@ struct linux_shmat_args
l_int shmid;
char *shmaddr;
l_int shmflg;
- l_ulong *raddr;
};
struct linux_shmctl_args
Modified: stable/12/sys/i386/linux/linux_machdep.c
==============================================================================
--- stable/12/sys/i386/linux/linux_machdep.c Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/i386/linux/linux_machdep.c Sun Apr 28 14:34:31 2019
(r346842)
@@ -133,7 +133,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
struct linux_semop_args a;
a.semid = args->arg1;
- a.tsops = args->ptr;
+ a.tsops = PTRIN(args->ptr);
a.nsops = args->arg2;
return (linux_semop(td, &a));
}
@@ -152,7 +152,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
a.semid = args->arg1;
a.semnum = args->arg2;
a.cmd = args->arg3;
- error = copyin(args->ptr, &a.arg, sizeof(a.arg));
+ error = copyin(PTRIN(args->ptr), &a.arg, sizeof(a.arg));
if (error)
return (error);
return (linux_semctl(td, &a));
@@ -161,7 +161,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
struct linux_msgsnd_args a;
a.msqid = args->arg1;
- a.msgp = args->ptr;
+ a.msgp = PTRIN(args->ptr);
a.msgsz = args->arg2;
a.msgflg = args->arg3;
return (linux_msgsnd(td, &a));
@@ -176,15 +176,15 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
struct l_ipc_kludge tmp;
int error;
- if (args->ptr == NULL)
+ if (args->ptr == 0)
return (EINVAL);
- error = copyin(args->ptr, &tmp, sizeof(tmp));
+ error = copyin(PTRIN(args->ptr), &tmp, sizeof(tmp));
if (error)
return (error);
- a.msgp = tmp.msgp;
+ a.msgp = PTRIN(tmp.msgp);
a.msgtyp = tmp.msgtyp;
} else {
- a.msgp = args->ptr;
+ a.msgp = PTRIN(args->ptr);
a.msgtyp = args->arg5;
}
return (linux_msgrcv(td, &a));
@@ -201,22 +201,29 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
a.msqid = args->arg1;
a.cmd = args->arg2;
- a.buf = args->ptr;
+ a.buf = PTRIN(args->ptr);
return (linux_msgctl(td, &a));
}
case LINUX_SHMAT: {
struct linux_shmat_args a;
+ l_uintptr_t addr;
+ int error;
a.shmid = args->arg1;
- a.shmaddr = args->ptr;
+ a.shmaddr = PTRIN(args->ptr);
a.shmflg = args->arg2;
- a.raddr = (l_ulong *)args->arg3;
- return (linux_shmat(td, &a));
+ error = linux_shmat(td, &a);
+ if (error != 0)
+ return (error);
+ addr = td->td_retval[0];
+ error = copyout(&addr, PTRIN(args->arg3), sizeof(addr));
+ td->td_retval[0] = 0;
+ return (error);
}
case LINUX_SHMDT: {
struct linux_shmdt_args a;
- a.shmaddr = args->ptr;
+ a.shmaddr = PTRIN(args->ptr);
return (linux_shmdt(td, &a));
}
case LINUX_SHMGET: {
@@ -232,7 +239,7 @@ linux_ipc(struct thread *td, struct linux_ipc_args *ar
a.shmid = args->arg1;
a.cmd = args->arg2;
- a.buf = args->ptr;
+ a.buf = PTRIN(args->ptr);
return (linux_shmctl(td, &a));
}
default:
Modified: stable/12/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/12/sys/i386/linux/linux_proto.h Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/i386/linux/linux_proto.h Sun Apr 28 14:34:31 2019
(r346842)
@@ -372,9 +372,9 @@ struct linux_ipc_args {
char what_l_[PADL_(l_uint)]; l_uint what; char what_r_[PADR_(l_uint)];
char arg1_l_[PADL_(l_int)]; l_int arg1; char arg1_r_[PADR_(l_int)];
char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)];
- char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)];
- char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
- char arg5_l_[PADL_(l_long)]; l_long arg5; char arg5_r_[PADR_(l_long)];
+ char arg3_l_[PADL_(l_uint)]; l_uint arg3; char arg3_r_[PADR_(l_uint)];
+ char ptr_l_[PADL_(l_uintptr_t)]; l_uintptr_t ptr; char
ptr_r_[PADR_(l_uintptr_t)];
+ char arg5_l_[PADL_(l_uint)]; l_uint arg5; char arg5_r_[PADR_(l_uint)];
};
struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
Modified: stable/12/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- stable/12/sys/i386/linux/linux_systrace_args.c Sun Apr 28 14:30:25
2019 (r346841)
+++ stable/12/sys/i386/linux/linux_systrace_args.c Sun Apr 28 14:34:31
2019 (r346842)
@@ -814,9 +814,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->what; /* l_uint */
iarg[1] = p->arg1; /* l_int */
iarg[2] = p->arg2; /* l_int */
- iarg[3] = p->arg3; /* l_int */
- uarg[4] = (intptr_t) p->ptr; /* void * */
- iarg[5] = p->arg5; /* l_long */
+ iarg[3] = p->arg3; /* l_uint */
+ iarg[4] = p->ptr; /* l_uintptr_t */
+ iarg[5] = p->arg5; /* l_uint */
*n_args = 6;
break;
}
@@ -4012,13 +4012,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 3:
- p = "l_int";
+ p = "l_uint";
break;
case 4:
- p = "userland void *";
+ p = "l_uintptr_t";
break;
case 5:
- p = "l_long";
+ p = "l_uint";
break;
default:
break;
Modified: stable/12/sys/i386/linux/syscalls.master
==============================================================================
--- stable/12/sys/i386/linux/syscalls.master Sun Apr 28 14:30:25 2019
(r346841)
+++ stable/12/sys/i386/linux/syscalls.master Sun Apr 28 14:34:31 2019
(r346842)
@@ -214,8 +214,8 @@
115 AUE_SWAPOFF STD { int linux_swapoff(void); }
116 AUE_NULL STD { int linux_sysinfo(struct l_sysinfo *info); }
117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \
- l_int arg2, l_int arg3, void *ptr, \
- l_long arg5); }
+ l_int arg2, l_uint arg3, l_uintptr_t ptr, \
+ l_uint arg5); }
118 AUE_FSYNC NOPROTO { int fsync(int fd); }
119 AUE_SIGRETURN STD { int linux_sigreturn( \
struct l_sigframe *sfp); }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
