Module Name: src
Committed By: riastradh
Date: Sat Jul 29 01:05:54 UTC 2017
Modified Files:
src/sys/compat/ibcs2: ibcs2_stat.c
Log Message:
Don't drop vnode ref until we're done with mount in ibcs2_stat(v)fs.
Nothing else guarantees the mount will stick around.
>From Ilja Van Sprundel.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/ibcs2/ibcs2_stat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ibcs2/ibcs2_stat.c
diff -u src/sys/compat/ibcs2/ibcs2_stat.c:1.48 src/sys/compat/ibcs2/ibcs2_stat.c:1.49
--- src/sys/compat/ibcs2/ibcs2_stat.c:1.48 Fri Sep 5 09:21:54 2014
+++ src/sys/compat/ibcs2/ibcs2_stat.c Sat Jul 29 01:05:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_stat.c,v 1.48 2014/09/05 09:21:54 matt Exp $ */
+/* $NetBSD: ibcs2_stat.c,v 1.49 2017/07/29 01:05:54 riastradh Exp $ */
/*
* Copyright (c) 1995, 1998 Scott Bartram
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.48 2014/09/05 09:21:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.49 2017/07/29 01:05:54 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,11 +147,13 @@ ibcs2_sys_statfs(struct lwp *l, const st
return (error);
mp = vp->v_mount;
sp = &mp->mnt_stat;
- vrele(vp);
if ((error = VFS_STATVFS(mp, sp)) != 0)
- return (error);
+ goto out;
sp->f_flag = mp->mnt_flag & MNT_VISFLAGMASK;
- return cvt_statfs(sp, (void *)SCARG(uap, buf), SCARG(uap, len));
+ error = cvt_statfs(sp, (void *)SCARG(uap, buf), SCARG(uap, len));
+out:
+ vrele(vp);
+ return (error);
}
int
@@ -200,12 +202,14 @@ ibcs2_sys_statvfs(struct lwp *l, const s
return (error);
mp = vp->v_mount;
sp = &mp->mnt_stat;
- vrele(vp);
if ((error = VFS_STATVFS(mp, sp)) != 0)
return (error);
sp->f_flag = mp->mnt_flag & MNT_VISFLAGMASK;
- return cvt_statvfs(sp, (void *)SCARG(uap, buf),
- sizeof(struct ibcs2_statvfs));
+ error = cvt_statvfs(sp, (void *)SCARG(uap, buf),
+ sizeof(struct ibcs2_statvfs));
+out:
+ vrele(vp);
+ return error;
}
int
