From a19c050611f408ccd62fc2756a8fa2a7c2e9babc Mon Sep 17 00:00:00 2001 From: Dhaval Giani Date: Fri, 27 Oct 2017 19:22:53 -0400 Subject: [PATCH] Revert "drivers/char/mem.c: deny access in open operation when securelevel is set" This reverts commit 8ca81822fffb2536aa1076fb17d1ea1413df3e7f. Orabug: 27037788 Signed-off-by: Dhaval Giani --- drivers/char/mem.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 5ffb67599431..fff12a61d8cb 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -183,6 +183,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, if (p != *ppos) return -EFBIG; + if (get_securelevel() > 0) + return -EPERM; + if (!valid_phys_addr_range(p, count)) return -EFAULT; @@ -535,6 +538,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ int err = 0; + if (get_securelevel() > 0) + return -EPERM; + if (p < (unsigned long) high_memory) { unsigned long to_write = min_t(unsigned long, count, (unsigned long)high_memory - p); @@ -582,6 +588,9 @@ static ssize_t read_port(struct file *file, char __user *buf, unsigned long i = *ppos; char __user *tmp = buf; + if (get_securelevel() > 0) + return -EPERM; + if (!access_ok(VERIFY_WRITE, buf, count)) return -EFAULT; while (count-- > 0 && i < 65536) { @@ -600,6 +609,9 @@ static ssize_t write_port(struct file *file, const char __user *buf, unsigned long i = *ppos; const char __user *tmp = buf; + if (get_securelevel() > 0) + return -EPERM; + if (!access_ok(VERIFY_READ, buf, count)) return -EFAULT; while (count-- > 0 && i < 65536) { @@ -735,9 +747,6 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig) static int open_port(struct inode *inode, struct file *filp) { - if (get_securelevel() > 0) - return -EPERM; - return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; } -- 2.50.1