Commit 242631c4 authored by Stephen Smalley's avatar Stephen Smalley Committed by James Morris

selinux: simplify ioctl checking

Simplify and improve the robustness of the SELinux ioctl checking by
using the "access mode" bits of the ioctl command to determine the
permission check rather than dealing with individual command values.
This removes any knowledge of specific ioctl commands from SELinux
and follows the same guidance we gave to Smack earlier.
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent abc69bb6
...@@ -42,9 +42,7 @@ ...@@ -42,9 +42,7 @@
#include <linux/fdtable.h> #include <linux/fdtable.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/ext2_fs.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/kd.h>
#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv6.h> #include <linux/netfilter_ipv6.h>
#include <linux/tty.h> #include <linux/tty.h>
...@@ -2903,46 +2901,16 @@ static void selinux_file_free_security(struct file *file) ...@@ -2903,46 +2901,16 @@ static void selinux_file_free_security(struct file *file)
static int selinux_file_ioctl(struct file *file, unsigned int cmd, static int selinux_file_ioctl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
int error = 0; u32 av = 0;
switch (cmd) {
case FIONREAD:
/* fall through */
case FIBMAP:
/* fall through */
case FIGETBSZ:
/* fall through */
case EXT2_IOC_GETFLAGS:
/* fall through */
case EXT2_IOC_GETVERSION:
error = file_has_perm(current, file, FILE__GETATTR);
break;
case EXT2_IOC_SETFLAGS:
/* fall through */
case EXT2_IOC_SETVERSION:
error = file_has_perm(current, file, FILE__SETATTR);
break;
/* sys_ioctl() checks */
case FIONBIO:
/* fall through */
case FIOASYNC:
error = file_has_perm(current, file, 0);
break;
case KDSKBENT: if (_IOC_DIR(cmd) & _IOC_WRITE)
case KDSKBSENT: av |= FILE__WRITE;
error = task_has_capability(current, CAP_SYS_TTY_CONFIG); if (_IOC_DIR(cmd) & _IOC_READ)
break; av |= FILE__READ;
if (!av)
av = FILE__IOCTL;
/* default case assumes that the command will go return file_has_perm(current, file, av);
* to the file's ioctl() function.
*/
default:
error = file_has_perm(current, file, FILE__IOCTL);
}
return error;
} }
static int file_map_prot_check(struct file *file, unsigned long prot, int shared) static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment