public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Petr Tesarik <ptesarik@suse.cz>
To: Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 01/10] Return EOF on out-of-bounds read from /dev/mem
Date: Fri, 17 Jun 2011 10:43:56 +0200	[thread overview]
Message-ID: <201106171043.57138.ptesarik@suse.cz> (raw)
In-Reply-To: <201106171038.25988.ptesarik@suse.cz>

The off parameter (type loff_t) may specify an offset that cannot
be represented by a long. Currently, /dev/mem wraps around, which
may to cause applications to read/write incorrect regions of memory
by accident.

Follow the usual file semantics here and return 0 when reading or
-EFBIG when writing beyond the accessible range.

Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
---
 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 8fc04b4..f5cbd4e 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -97,6 +97,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;
@@ -155,6 +158,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;
 
-- 
1.7.3.4

  reply	other threads:[~2011-06-17  8:57 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-17  8:38 [PATCH 00/10] Enhance /dev/mem to allow read/write of arbitrary physical addresses Petr Tesarik
2011-06-17  8:43 ` Petr Tesarik [this message]
2011-06-17  8:44 ` [PATCH 02/10] (un)xlate_dev_mem_ptr: use phys_addr_t for the @phys parameter Petr Tesarik
2011-06-17  8:45 ` [PATCH 03/10] x86: translate highmem /dev/mem pointers Petr Tesarik
2011-06-17  8:45 ` [PATCH 04/10] ia64: change xlate_dev_mem_ptr's argument to phys_addr_t Petr Tesarik
2011-06-17  8:45 ` [PATCH 05/10] valid_phys_addr_range: use phys_addr_t for the @addr parameter Petr Tesarik
2011-06-17  8:46 ` [PATCH 06/10] sh: change valid_phys_addr_range's @addr param to phys_addr_t Petr Tesarik
2011-06-17  8:46 ` [PATCH 07/10] arm: " Petr Tesarik
2011-06-17  8:47 ` [PATCH 08/10] ia64: " Petr Tesarik
2011-06-17  8:48 ` [PATCH 09/10] x86: provide arch-specific valid_phys_addr_range() Petr Tesarik
2011-06-17  8:48 ` [PATCH 10/10] Allow reading/writing all memory through /dev/mem Petr Tesarik
2011-06-17  9:30 ` [PATCH 00/10] Enhance /dev/mem to allow read/write of arbitrary physical addresses Ingo Molnar
2011-06-17  9:41   ` Russell King - ARM Linux
2011-06-17  9:55   ` Petr Tesarik
2011-06-20  2:42     ` Américo Wang
2011-06-27  7:46       ` Petr Tesarik
2011-06-19 23:02   ` Ryan Mallon
2011-06-19 23:44     ` H. Peter Anvin
2011-06-20  7:41       ` Ingo Molnar
2011-06-20 15:59         ` H. Peter Anvin
2011-06-20 16:40           ` Ingo Molnar
2011-06-20 16:44             ` H. Peter Anvin
2011-06-21  6:55           ` Srivatsa Vaddagiri
2011-06-20  0:42     ` Matthew Wilcox
2011-06-20  0:46       ` Ryan Mallon
2011-06-20  0:52         ` Matthew Wilcox
2011-06-20  1:02           ` Ryan Mallon
2011-06-20  7:31     ` Ingo Molnar
2011-06-20  8:03       ` Ryan Mallon
2011-06-20 17:10     ` Ray Lee
2011-06-29  9:05   ` Petr Tesarik
2011-07-01 12:58     ` Ingo Molnar
2011-07-01 13:43       ` Petr Tesarik
2011-07-01 13:47       ` Christoph Hellwig
2011-07-01 14:37         ` Ingo Molnar
2011-07-01 14:41           ` Christoph Hellwig
2011-07-01 14:46             ` Ingo Molnar
2011-07-01 14:54               ` Petr Tesarik
2011-07-01 15:36                 ` Ingo Molnar
2011-07-01 16:00                   ` H. Peter Anvin
2011-07-01 16:13                     ` Ingo Molnar
2011-07-01 19:34                       ` Petr Tesarik
2011-07-01 19:56                         ` Ingo Molnar
2011-07-01 20:44                           ` Petr Tesarik
2011-07-03 19:46                             ` Ingo Molnar
2011-07-05 17:49                               ` Matthew Garrett
2011-07-05 17:56                                 ` H. Peter Anvin
2011-07-05 22:34                                 ` H. Peter Anvin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201106171043.57138.ptesarik@suse.cz \
    --to=ptesarik@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox