d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to copyin extra data for IPC_RMID requests to msgctl() or

Browse Source 
shmctl().  None of the other ABI's do this (including the native FreeBSD
ABI), and uselessly trying to do a copyin() can actually result in a
bogus EFAULT if the a process specifies NULL for the optional argument
(which is what they should do in this case).
This commit is contained in:
John Baldwin 2006-07-06 21:38:24 +00:00
parent 42fd98d94b
commit d699b1ce00
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/compat/svr4/svr4_ipc.c
View File

@ -500,11 +500,7 @@ svr4_msgctl(td, v)
return (kern_msgctl(td, uap->msqid, IPC_SET, &bs));
case SVR4_IPC_RMID:
error = copyin(uap->buf, &ss, sizeof ss);
if (error)
return error;
svr4_to_bsd_msqid_ds(&ss, &bs);
return (kern_msgctl(td, uap->msqid, IPC_RMID, &bs));
return (kern_msgctl(td, uap->msqid, IPC_RMID, NULL));
default:
return EINVAL;
@ -658,7 +654,6 @@ svr4_shmctl(td, v)
if (uap->buf != NULL) {
switch (uap->cmd) {
case SVR4_IPC_SET:
case SVR4_IPC_RMID:
case SVR4_SHM_LOCK:
case SVR4_SHM_UNLOCK:
error = copyin(uap->buf, &ss, sizeof(ss));