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

Handle copyout for the fcntl(F_OGETLK) using oflock structure.

Browse Source 
Otherwise, kernel overwrites a word past the destination.

Submitted by:	walter@pelissero.de
PR:	196718
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2015-07-08 13:19:13 +00:00
parent cb02f6b942
commit 69d11def74
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=285269
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/kern_descrip.c
View File

@ -404,9 +404,10 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
struct flock fl;
struct __oflock ofl;
intptr_t arg1;
int error;
int error, newcmd;
error = 0;
newcmd = cmd;
switch (cmd) {
case F_OGETLK:
case F_OSETLK:
@ -424,13 +425,13 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
switch (cmd) {
case F_OGETLK:
cmd = F_GETLK;
newcmd = F_GETLK;
break;
case F_OSETLK:
cmd = F_SETLK;
newcmd = F_SETLK;
break;
case F_OSETLKW:
cmd = F_SETLKW;
newcmd = F_SETLKW;
break;
}
arg1 = (intptr_t)&fl;
@ -448,7 +449,7 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
}
if (error)
return (error);
error = kern_fcntl(td, fd, cmd, arg1);
error = kern_fcntl(td, fd, newcmd, arg1);
if (error)
return (error);
if (cmd == F_OGETLK) {