[selinux-policy: 1183/3172] fix a few fcs

[Daniel J Walsh]

commit 8ff5530c3c404be4b907b909614c1b334ec35372
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Wed Feb 1 16:34:54 2006 +0000

    fix a few fcs

 refpolicy/policy/modules/kernel/devices.fc  |    6 +++---
 refpolicy/policy/modules/kernel/storage.fc  |    4 +++-
 refpolicy/policy/modules/kernel/terminal.fc |    6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/refpolicy/policy/modules/kernel/devices.fc b/refpolicy/policy/modules/kernel/devices.fc
index 0cf1cc1..e194c75 100644
--- a/refpolicy/policy/modules/kernel/devices.fc
+++ b/refpolicy/policy/modules/kernel/devices.fc
@@ -3,7 +3,7 @@
 
 /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
 /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
-/dev/agpgart		-c	gen_context(system_u:object_r:agp_device_t,s0)
+/dev/(misc/)?agpgart	-c	gen_context(system_u:object_r:agp_device_t,s0)
 /dev/aload.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 /dev/amidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 /dev/amixer.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -33,12 +33,12 @@
 /dev/patmgr[01]		-c	gen_context(system_u:object_r:sound_device_t,s0)
 /dev/pmu			-c	gen_context(system_u:object_r:power_device_t,s0)
 /dev/port		-c	gen_context(system_u:object_r:memory_device_t,s15:c0.c255)
-/dev/psaux		-c	gen_context(system_u:object_r:mouse_device_t,s0)
+/dev/(misc/)?psaux	-c	gen_context(system_u:object_r:mouse_device_t,s0)
 /dev/rmidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 /dev/radeon		-c	gen_context(system_u:object_r:dri_device_t,s0)
 /dev/radio.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 /dev/random		-c	gen_context(system_u:object_r:random_device_t,s0)
-/dev/rtc			-c	gen_context(system_u:object_r:clock_device_t,s0)
+/dev/(misc/)?rtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
 /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
 /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
 /dev/smpte.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
diff --git a/refpolicy/policy/modules/kernel/storage.fc b/refpolicy/policy/modules/kernel/storage.fc
index b4b34f4..30d7868 100644
--- a/refpolicy/policy/modules/kernel/storage.fc
+++ b/refpolicy/policy/modules/kernel/storage.fc
@@ -21,7 +21,7 @@
 /dev/jsfd		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
 /dev/jsflash		-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
 /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
-/dev/lvm		-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+/dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
 /dev/mcdx?		-b	gen_context(system_u:object_r:removable_device_t,s0)
 /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
 /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
@@ -49,6 +49,8 @@ ifdef(`distro_redhat', `
 
 /dev/cciss/[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
 
+/dev/floppy/[^/]*	-b	gen_context(system_u:object_r:removable_device_t,s0)
+
 /dev/i2o/hd[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
 
 /dev/ida/[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
diff --git a/refpolicy/policy/modules/kernel/terminal.fc b/refpolicy/policy/modules/kernel/terminal.fc
index a19c3a3..df0d76c 100644
--- a/refpolicy/policy/modules/kernel/terminal.fc
+++ b/refpolicy/policy/modules/kernel/terminal.fc
@@ -4,7 +4,7 @@
 /dev/adb.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 /dev/capi.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 /dev/cu.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
-/dev/dcbri[0-9]+	-c	gen_context(system_u:object_r:tty_device_t,s0)
+/dev/dcbri[0-9]+		-c	gen_context(system_u:object_r:tty_device_t,s0)
 /dev/hvc.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 /dev/hvsi.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 /dev/ircomm[0-9]+	-c	gen_context(system_u:object_r:tty_device_t,s0)
@@ -12,13 +12,15 @@
 /dev/isdn.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 /dev/ptmx		-c	gen_context(system_u:object_r:ptmx_t,s0)
 /dev/rfcomm[0-9]+	-c	gen_context(system_u:object_r:tty_device_t,s0)
-/dev/tty		-c	gen_context(system_u:object_r:devtty_t,s0)
+/dev/tty			-c	gen_context(system_u:object_r:devtty_t,s0)
 /dev/ttySG.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 
 /dev/pty/.*		-c	gen_context(system_u:object_r:bsdpty_device_t,s0)
 
 /dev/pts			-d	gen_context(system_u:object_r:devpts_t,s0-s15:c0.c255)
 
+/dev/tts/[^/]*		-c	gen_context(system_u:object_r:tty_device_t,s0)
+
 /dev/vcc?/.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 
 /dev/vcs[^/]*		-c	gen_context(system_u:object_r:tty_device_t,s0)