mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chuck Ebbert <76306.1226@compuserve.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Andi Kleen <ak@suse.de>, Linus Torvalds <torvalds@osdl.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Chuck Ebbert <76306.1226@compuserve.com>
Subject: [patch 2.6.13-rc6] Fix kmem read on 32-bit archs
Date: Sun, 14 Aug 2005 12:12:52 -0400	[thread overview]
Message-ID: <200508141214_MC3-1-A731-BBE9@compuserve.com> (raw)

  The first thing drivers/char/mem.c:read_kmem does is convert the
loff_t it gets as the offset for reading into an unsigned int.  This
patch makes the kmem driver's llseek operator do that up-front, so
that fs/read_write.c:rw_verify_area doesn't return -EINVAL when
we try to read from higher addresses.

  It's ugly but so is the existing code.  And it won't fix 64-bit
archs AFAICT.  Tested on 2.6.11, patch offsets fixed up for 2.6.13-rc6.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>

Index: 2.6.13-rc6/drivers/char/mem.c
===================================================================
--- 2.6.13-rc6.orig/drivers/char/mem.c	2005-08-14 11:49:11.000000000 -0400
+++ 2.6.13-rc6/drivers/char/mem.c	2005-08-14 11:51:15.000000000 -0400
@@ -747,6 +747,29 @@
 	return ret;
 }
 
+static loff_t kmem_lseek(struct file * file, loff_t offset, int orig)
+{
+	loff_t ret = -EINVAL;
+
+	if (orig == 2)  /* sys_seek/llseek has checked orig = {012} */
+		goto out;
+
+	down(&file->f_dentry->d_inode->i_sem);
+	switch (orig) {
+		case 0:
+			file->f_pos = offset;
+			break;
+		case 1:
+			file->f_pos += offset;
+	}
+	ret = file->f_pos;
+	file->f_pos = (loff_t)(unsigned long)file->f_pos;
+	force_successful_syscall_return();
+	up(&file->f_dentry->d_inode->i_sem);
+out:
+	return ret;
+}
+
 static int open_port(struct inode * inode, struct file * filp)
 {
 	return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
@@ -769,7 +792,7 @@
 };
 
 static struct file_operations kmem_fops = {
-	.llseek		= memory_lseek,
+	.llseek		= kmem_lseek,
 	.read		= read_kmem,
 	.write		= write_kmem,
 	.mmap		= mmap_kmem,
__
Chuck

             reply	other threads:[~2005-08-14 16:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-08-14 16:12 Chuck Ebbert [this message]
2005-08-14 16:22 ` Andi Kleen
2005-08-14 16:24 ` Linus Torvalds
2005-08-14 16:50 ` Linus Torvalds
2005-08-14 20:36 Chuck Ebbert
2005-08-15  1:16 ` Linus Torvalds

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=200508141214_MC3-1-A731-BBE9@compuserve.com \
    --to=76306.1226@compuserve.com \
    --cc=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=torvalds@osdl.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

all inboxes | Powered by JetHome®