diff options
author | Petr Tesarik <ptesarik@suse.cz> | 2014-01-30 12:48:02 +0400 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-04-25 20:40:45 +0400 |
commit | 3566e03b5bc9c06855b07423ab4c6e2710aa21e4 (patch) | |
tree | a35a8928643b828670e58b973cabf2672890cd3b | |
parent | de0b7b0dd1b625c8b4730869ae3d651e9189617c (diff) | |
download | linux-3566e03b5bc9c06855b07423ab4c6e2710aa21e4.tar.xz |
/dev/mem: handle out-of-bounds read/write
commit 08d2d00b291ed4eb91530050274e67a761c1901d upstream.
The loff_t type may be wider than phys_addr_t (e.g. on 32-bit systems).
Consequently, the file offset may be truncated in the assignment.
Currently, /dev/mem wraps around, which may cause applications to read
or write incorrect regions of memory by accident.
Let's follow POSIX file semantics here and return 0 when reading from
and -EFBIG when writing to an offset that cannot be represented by a
phys_addr_t.
Note that the conditional is optimized out by the compiler if loff_t
has the same size as phys_addr_t.
Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | drivers/char/mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index f895a8c8a244..d1f4675809f8 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -100,6 +100,9 @@ static ssize_t read_mem(struct file *file, char __user *buf, ssize_t read, sz; char *ptr; + if (p != *ppos) + return 0; + if (!valid_phys_addr_range(p, count)) return -EFAULT; read = 0; @@ -158,6 +161,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, unsigned long copied; void *ptr; + if (p != *ppos) + return -EFBIG; + if (!valid_phys_addr_range(p, count)) return -EFAULT; |