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

When generate a core dump, use advisory locking in an advisory way:

Browse Source 
if we do acquire an advisory lock, great!  We'll release it later.
However, if we fail to acquire a lock, we perform the coredump
anyway.  This problem became particularly visible with NFS after
the introduction of rpc.lockd: if the lock manager isn't running,
then locking calls will fail, aborting the core dump (resulting in
a zero-byte dump file).

Reported by:	Yogeshwar Shenoy <ynshenoy@alumni.cs.ucsb.edu>
This commit is contained in:
Robert Watson 2003-10-25 16:14:09 +00:00
parent 67536f038c
commit c447f5b2f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_sig.c
View File

@ -2521,7 +2521,7 @@ coredump(struct thread *td)
struct flock lf;
struct nameidata nd;
struct vattr vattr;
int error, error1, flags;
int error, error1, flags, locked;
struct mount *mp;
char *name; /* name of corefile */
off_t limit;
@ -2575,9 +2575,7 @@ coredump(struct thread *td)
lf.l_start = 0;
lf.l_len = 0;
lf.l_type = F_WRLCK;
error = VOP_ADVLOCK(vp, (caddr_t)p, F_SETLK, &lf, F_FLOCK);
if (error)
goto out2;
locked = (VOP_ADVLOCK(vp, (caddr_t)p, F_SETLK, &lf, F_FLOCK) == 0);
if (vn_start_write(vp, &mp, V_NOWAIT) != 0) {
lf.l_type = F_UNLCK;
@ -2603,8 +2601,10 @@ coredump(struct thread *td)
p->p_sysent->sv_coredump(td, vp, limit) :
ENOSYS;
lf.l_type = F_UNLCK;
VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK);
if (locked) {
lf.l_type = F_UNLCK;
VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK);
}
vn_finished_write(mp);
out2:
error1 = vn_close(vp, FWRITE, cred, td);