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

fd: pwd_drop after releasing filedesc lock

Browse Source 
Fixes a potential LOR against vnode lock.
This commit is contained in:
Mateusz Guzik 2020-08-22 16:57:45 +00:00
parent 1c1ab42925
commit cd4a1797b0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_descrip.c
View File

@ -3957,7 +3957,6 @@ kern_proc_filedesc_out(struct proc *p, struct sbuf *sb, ssize_t maxlen,
vrefact(pwd->pwd_jdir);
export_vnode_to_sb(pwd->pwd_jdir, KF_FD_TYPE_JAIL, FREAD, efbuf);
}
pwd_drop(pwd);
}
lastfile = fdlastfile(fdp);
for (i = 0; fdp->fd_refcnt > 0 && i <= lastfile; i++) {
@ -3979,6 +3978,8 @@ kern_proc_filedesc_out(struct proc *p, struct sbuf *sb, ssize_t maxlen,
break;
}
FILEDESC_SUNLOCK(fdp);
if (pwd != NULL)
pwd_drop(pwd);
fddrop(fdp);
fail:
free(efbuf, M_TEMP);
@ -4100,7 +4101,6 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
if (pwd->pwd_jdir != NULL)
export_vnode_for_osysctl(pwd->pwd_jdir, KF_FD_TYPE_JAIL, kif,
okif, fdp, req);
pwd_drop(pwd);
}
lastfile = fdlastfile(fdp);
for (i = 0; fdp->fd_refcnt > 0 && i <= lastfile; i++) {
@ -4116,6 +4116,8 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
break;
}
FILEDESC_SUNLOCK(fdp);
if (pwd != NULL)
pwd_drop(pwd);
fddrop(fdp);
free(kif, M_TEMP);
free(okif, M_TEMP);