diff options
author | rwatson <rwatson@FreeBSD.org> | 2002-12-09 03:44:28 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2002-12-09 03:44:28 +0000 |
commit | c5caffe9c429caa50e5fbb079d7ee14257116c62 (patch) | |
tree | d6e9f6d24a2d8fb99e7d51ac22d960517e26182b /sys/fs/devfs/devfs_devs.c | |
parent | 5fcceddc0789f268ea6002c625215947c0cbe4b9 (diff) | |
download | FreeBSD-src-c5caffe9c429caa50e5fbb079d7ee14257116c62.zip FreeBSD-src-c5caffe9c429caa50e5fbb079d7ee14257116c62.tar.gz |
Remove dm_root entry from struct devfs_mount. It's never set, and is
unused. Replace it with a dm_mount back-pointer to the struct mount
that the devfs_mount is associated with. Export that pointer to MAC
Framework entry points, where all current policies don't use the
pointer. This permits the SEBSD port of SELinux's FLASK/TE to compile
out-of-the-box on 5.0-CURRENT with full file system labeling support.
Approved by: re (murray)
Obtained from: TrustedBSD Project
Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sys/fs/devfs/devfs_devs.c')
-rw-r--r-- | sys/fs/devfs/devfs_devs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index c01eba4..cb7c99c 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -334,8 +334,8 @@ devfs_populate(struct devfs_mount *dm) if (de == NULL) { de = devfs_vmkdir(s, q - s, dd); #ifdef MAC - mac_create_devfs_directory(s, q - s, - de); + mac_create_devfs_directory( + dm->dm_mount, s, q - s, de); #endif de->de_inode = dm->dm_inode++; TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); @@ -363,7 +363,7 @@ devfs_populate(struct devfs_mount *dm) de->de_dirent->d_type = DT_CHR; } #ifdef MAC - mac_create_devfs_device(dev, de); + mac_create_devfs_device(dm->dm_mount, dev, de); #endif *dep = de; de->de_dir = dd; |