Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=38ad2ed08d89a4b830a03131fa73e4ef3e98d9f4
Commit:     38ad2ed08d89a4b830a03131fa73e4ef3e98d9f4
Parent:     f4d2781731e846c2f01dd85e71883d120860c6dd
Author:     Paul Fulghum <[EMAIL PROTECTED]>
AuthorDate: Sat Jun 16 10:15:55 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Jun 16 13:16:15 2007 -0700

    tty: restore locked ioctl file op
    
    Restore tty locked ioctl handler which was replaced with
    an unlocked ioctl handler in hung_up_tty_fops by the patch:
    
    commit e10cc1df1d2014f68a4bdcf73f6dd122c4561f94
    Author: Paul Fulghum <[EMAIL PROTECTED]>
    Date:   Thu May 10 22:22:50 2007 -0700
    
        tty: add compat_ioctl
    
    This was reported in:
    [Bug 8473] New: Oops: 0010 [1] SMP
    
    The bug is caused by switching to hung_up_tty_fops in do_tty_hangup.  An
    ioctl call can be waiting on BLK after testing for existence of the locked
    ioctl handler in the normal tty fops, but before calling the locked ioctl
    handler.  If a hangup occurs at that point, the locked ioctl fop is NULL
    and an oops occurs.
    
    (akpm: we can remove my debugging code from do_ioctl() now, but it'll be OK 
to
    do that for 2.6.23)
    
    Signed-off-by: Paul Fulghum <[EMAIL PROTECTED]>
    Cc: Alan Cox <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/tty_io.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 3752edc..a96f26a 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1173,8 +1173,14 @@ static unsigned int hung_up_tty_poll(struct file * filp, 
poll_table * wait)
        return POLLIN | POLLOUT | POLLERR | POLLHUP | POLLRDNORM | POLLWRNORM;
 }
 
-static long hung_up_tty_ioctl(struct file * file,
-                             unsigned int cmd, unsigned long arg)
+static int hung_up_tty_ioctl(struct inode * inode, struct file * file,
+                            unsigned int cmd, unsigned long arg)
+{
+       return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
+}
+
+static long hung_up_tty_compat_ioctl(struct file * file,
+                                    unsigned int cmd, unsigned long arg)
 {
        return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
 }
@@ -1222,8 +1228,8 @@ static const struct file_operations hung_up_tty_fops = {
        .read           = hung_up_tty_read,
        .write          = hung_up_tty_write,
        .poll           = hung_up_tty_poll,
-       .unlocked_ioctl = hung_up_tty_ioctl,
-       .compat_ioctl   = hung_up_tty_ioctl,
+       .ioctl          = hung_up_tty_ioctl,
+       .compat_ioctl   = hung_up_tty_compat_ioctl,
        .release        = tty_release,
 };
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to