Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Label /dev/dma_heap/* char devices with dma_device_t #787

Merged
merged 4 commits into from Jun 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion policy/modules/kernel/devices.fc
Expand Up @@ -24,7 +24,6 @@
/dev/crash -c gen_context(system_u:object_r:crash_device_t,mls_systemhigh)
/dev/dahdi/.* -c gen_context(system_u:object_r:sound_device_t,s0)
/dev/dlm.* -c gen_context(system_u:object_r:dlm_control_device_t,s0)
/dev/dma_heap -d gen_context(system_u:object_r:dma_device_dir_t,s0)
/dev/dma_heap/.+ -c gen_context(system_u:object_r:dma_device_t,s0)
/dev/dmfm.* -c gen_context(system_u:object_r:sound_device_t,s0)
/dev/dmmidi.* -c gen_context(system_u:object_r:sound_device_t,s0)
Expand Down
5 changes: 2 additions & 3 deletions policy/modules/kernel/devices.if
Expand Up @@ -6556,7 +6556,6 @@ gen_require(`
type device_t;
type acpi_device_t;
type dma_device_t;
type dma_device_dir_t;
type usb_device_t;
type uhid_device_t;
type sound_device_t;
Expand Down Expand Up @@ -6704,8 +6703,8 @@ gen_require(`
filetrans_pattern($1, device_t, dlm_control_device_t, chr_file, "dlm7")
filetrans_pattern($1, device_t, dlm_control_device_t, chr_file, "dlm8")
filetrans_pattern($1, device_t, dlm_control_device_t, chr_file, "dlm9")
filetrans_pattern($1, device_t, dma_device_dir_t, dir, "dma_heap")
filetrans_pattern($1, dma_device_dir_t, dma_device_t, chr_file)
# Note this file path is /dev/dma_heap/system
filetrans_pattern($1, device_t, dma_device_t, chr_file, "system")
filetrans_pattern($1, device_t, sound_device_t, chr_file, "dmfm")
filetrans_pattern($1, device_t, sound_device_t, chr_file, "dmmidi0")
filetrans_pattern($1, device_t, sound_device_t, chr_file, "dmmidi1")
Expand Down
3 changes: 0 additions & 3 deletions policy/modules/kernel/devices.te
Expand Up @@ -93,9 +93,6 @@ dev_node(dlm_control_device_t)
#
type dma_device_t;
dev_node(dma_device_t)
type dma_device_dir_t;
files_type(dma_device_dir_t)
dev_associate(dma_device_dir_t)

type dri_device_t;
dev_node(dri_device_t)
Expand Down