* [PATCH] read(tty, (char *)-1, 1) exempt from EFAULT ?
[not found] <3E773A83.9020800@BitWagon.com>
@ 2003-03-19 2:19 ` Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2003-03-19 2:19 UTC (permalink / raw)
To: linux-kernel
Hi all,
John Reiser posted a question on c.o.l.d.s about why reading from
a tty with a bad buffer doesn't return -EFAULT to the user.
I looked into it and believe that this is a minor bug. Below is
part of John's post and below that is my patch.
John Reiser wrote:
> Why is reading from a tty exempt from EFAULT?
>
> -----readerr.c
> #include <errno.h>
>
> int
> main()
> {
> int v = read(0,(char *)-1,1); /* should get EFAULT [14] */
> printf("read(0,(char *)-1,1)=0x%x errno=%d\n", v, errno);
> return v;
> }
> -----
> $ gcc -o readerr readerr.c
> $ ./readerr </dev/tty; echo $?
> # type <Enter>
> read(0,(char *)-1,1)=0x1 errno=0
> 1
> $ date | ./readerr; echo $?
> read(0,(char *)-1,1)=0xffffffff errno=14
> 255
> $
===========================
--- linux-2.4.20/drivers/char/n_tty.c_orig Tue Mar 18 20:19:33 2003
+++ linux-2.4.20/drivers/char/n_tty.c Tue Mar 18 21:06:57 2003
@@ -1030,7 +1030,10 @@
break;
cs = tty->link->ctrl_status;
tty->link->ctrl_status = 0;
- put_user(cs, b++);
+ if (put_user(cs, b++)) {
+ retval = -EFAULT;
+ break;
+ }
+ retval = -EFAULT;
+ break;
+ }
nr--;
break;
}
@@ -1069,7 +1072,10 @@
/* Deal with packet mode. */
if (tty->packet && b == buf) {
- put_user(TIOCPKT_DATA, b++);
+ if (put_user(TIOCPKT_DATA, b++)) {
+ retval = -EFAULT;
+ break;
+ }
nr--;
}
@@ -1096,12 +1102,17 @@
spin_unlock_irqrestore(&tty->read_lock,
flags);
if (!eol || (c != __DISABLED_CHAR)) {
- put_user(c, b++);
+ if (put_user(c, b++)) {
+ retval = -EFAULT;
+ break;
+ }
nr--;
}
if (eol)
break;
}
+ if (retval)
+ break;
} else {
int uncopied;
uncopied = copy_from_read_buf(tty, &b, &nr);
@@ -1136,7 +1147,7 @@
current->state = TASK_RUNNING;
size = b - buf;
- if (size) {
+ if (!retval && size) {
retval = size;
if (nr)
clear_bit(TTY_PUSH, &tty->flags);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] read(tty, (char *)-1, 1) exempt from EFAULT ?
@ 2003-03-19 3:05 Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2003-03-19 3:05 UTC (permalink / raw)
To: linux-kernel
I had a cut and paste error in my last patch. This should be correct:
--- linux-2.4.20/drivers/char/n_tty.c_orig Tue Mar 18 20:19:33 2003
+++ linux-2.4.20/drivers/char/n_tty.c Tue Mar 18 21:06:57 2003
@@ -1030,7 +1030,10 @@
break;
cs = tty->link->ctrl_status;
tty->link->ctrl_status = 0;
- put_user(cs, b++);
+ if (put_user(cs, b++)) {
+ retval = -EFAULT;
+ break;
+ }
nr--;
break;
}
@@ -1069,7 +1072,10 @@
/* Deal with packet mode. */
if (tty->packet && b == buf) {
- put_user(TIOCPKT_DATA, b++);
+ if (put_user(TIOCPKT_DATA, b++)) {
+ retval = -EFAULT;
+ break;
+ }
nr--;
}
@@ -1096,12 +1102,17 @@
spin_unlock_irqrestore(&tty->read_lock,
flags);
if (!eol || (c != __DISABLED_CHAR)) {
- put_user(c, b++);
+ if (put_user(c, b++)) {
+ retval = -EFAULT;
+ break;
+ }
nr--;
}
if (eol)
break;
}
+ if (retval)
+ break;
} else {
int uncopied;
uncopied = copy_from_read_buf(tty, &b, &nr);
@@ -1136,7 +1147,7 @@
current->state = TASK_RUNNING;
size = b - buf;
- if (size) {
+ if (!retval && size) {
retval = size;
if (nr)
clear_bit(TTY_PUSH, &tty->flags);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-03-19 2:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <3E773A83.9020800@BitWagon.com>
2003-03-19 2:19 ` [PATCH] read(tty, (char *)-1, 1) exempt from EFAULT ? Steven Rostedt
2003-03-19 3:05 Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox