Module Name: src
Committed By: hannken
Date: Tue May 3 07:34:38 UTC 2022
Modified Files:
src/sys/fs/sysvbfs: sysvbfs_vfsops.c
src/sys/fs/v7fs: v7fs_vfsops.c
Log Message:
Lock devvp for kauth KAUTH_REQ_SYSTEM_MOUNT_DEVICE.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/sysvbfs/sysvbfs_vfsops.c
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/v7fs/v7fs_vfsops.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/fs/sysvbfs/sysvbfs_vfsops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.47 src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.48
--- src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.47 Fri Jan 17 20:08:08 2020
+++ src/sys/fs/sysvbfs/sysvbfs_vfsops.c Tue May 3 07:34:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vfsops.c,v 1.47 2020/01/17 20:08:08 ad Exp $ */
+/* $NetBSD: sysvbfs_vfsops.c,v 1.48 2022/05/03 07:34:38 hannken Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.47 2020/01/17 20:08:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.48 2022/05/03 07:34:38 hannken Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -139,9 +139,11 @@ sysvbfs_mount(struct mount *mp, const ch
(mp->mnt_flag & MNT_RDONLY) == 0)
accessmode |= VWRITE;
+ vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
KAUTH_REQ_SYSTEM_MOUNT_DEVICE, mp, devvp,
KAUTH_ARG(accessmode));
+ VOP_UNLOCK(devvp);
}
if (error) {
Index: src/sys/fs/v7fs/v7fs_vfsops.c
diff -u src/sys/fs/v7fs/v7fs_vfsops.c:1.18 src/sys/fs/v7fs/v7fs_vfsops.c:1.19
--- src/sys/fs/v7fs/v7fs_vfsops.c:1.18 Sat Feb 5 14:11:52 2022
+++ src/sys/fs/v7fs/v7fs_vfsops.c Tue May 3 07:34:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vfsops.c,v 1.18 2022/02/05 14:11:52 zafer Exp $ */
+/* $NetBSD: v7fs_vfsops.c,v 1.19 2022/05/03 07:34:38 hannken Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_vfsops.c,v 1.18 2022/02/05 14:11:52 zafer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_vfsops.c,v 1.19 2022/05/03 07:34:38 hannken Exp $");
#if defined _KERNEL_OPT
#include "opt_v7fs.h"
#endif
@@ -157,9 +157,12 @@ v7fs_mount(struct mount *mp, const char
(mp->mnt_iflag & IMNT_WANTRDWR) != 0 :
(mp->mnt_flag & MNT_RDONLY) == 0)
accessmode |= VWRITE;
+
+ vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
KAUTH_REQ_SYSTEM_MOUNT_DEVICE, mp, devvp,
KAUTH_ARG(accessmode));
+ VOP_UNLOCK(devvp);
}
if (error) {
