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

If an incoming struct proc could have been NULL before, tehn don't

Browse Source 
automatically change the code to add

struct proc *p = td->td_proc;

because now 'td' is probably capable of being NULL too.
I expect to see more of this kind of error during the 'weeding'
process. It's too easy to make. (junior hacker project.. look for these :-)

Submitted by:	mark Peek <mp@freebsd.org>
This commit is contained in:
Julian Elischer 2001-09-12 20:26:57 +00:00
parent 69ebfe3495
commit 9dbea9237c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_descrip.c
View File

@ -1303,7 +1303,7 @@ fdcloseexec(td)
/*
* Internal form of close.
* Decrement reference count on file structure.
* Note: p may be NULL when closing a file
* Note: td may be NULL when closing a file
* that was being passed in a message.
*/
int
@ -1311,7 +1311,6 @@ closef(fp, td)
register struct file *fp;
register struct thread *td;
{
struct proc *p = td->td_proc;
struct vnode *vp;
struct flock lf;
@ -1325,13 +1324,15 @@ closef(fp, td)
* If the descriptor was in a message, POSIX-style locks
* aren't passed with the descriptor.
*/
if (p && (p->p_flag & P_ADVLOCK) && fp->f_type == DTYPE_VNODE) {
if (td && (td->td_proc->p_flag & P_ADVLOCK) &&
fp->f_type == DTYPE_VNODE) {
lf.l_whence = SEEK_SET;
lf.l_start = 0;
lf.l_len = 0;
lf.l_type = F_UNLCK;
vp = (struct vnode *)fp->f_data;
(void) VOP_ADVLOCK(vp, (caddr_t)p->p_leader, F_UNLCK, &lf, F_POSIX);
(void) VOP_ADVLOCK(vp, (caddr_t)td->td_proc->p_leader,
F_UNLCK, &lf, F_POSIX);
}
return (fdrop(fp, td));
}