[PATCH 1/1] TTY: tty_io, lookup retval fixup

[PATCH 1/1] TTY: tty_io, lookup retval fixup

[Jiri Slaby]

Make sure we fail on NULL return value possibly returned by pty
master lookup.

Convert NULL to ERR_PTR(-ENODEV), since NULL is not captured by
IS_ERR() in __tty_open.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/char/tty_io.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index ff92099..2c14dd8 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1217,7 +1217,8 @@ static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,
 	struct tty_struct *tty;
 
 	if (driver->ops->lookup)
-		return driver->ops->lookup(driver, inode, idx);
+		return driver->ops->lookup(driver, inode, idx) ? :
+			ERR_PTR(-ENODEV);
 
 	tty = driver->ttys[idx];
 	return tty;
-- 
1.6.1.2

Re: [PATCH 1/1] TTY: tty_io, lookup retval fixup

[Alan Cox]

On Sun,  1 Feb 2009 22:39:16 +0100
Jiri Slaby <jirislaby@gmail.com> wrote:

> Make sure we fail on NULL return value possibly returned by pty
> master lookup.
> 
> Convert NULL to ERR_PTR(-ENODEV), since NULL is not captured by
> IS_ERR() in __tty_open.

Better to fix any broken functions I think

[PATCH 1/1] TTY: pty, lookup retval fixup

[Jiri Slaby]

Make sure we fail on NULL return value possibly returned by
master tty lookup.

Convert NULL to ERR_PTR(-ENODEV) in ptm_unix98_lookup, since NULL
is not captured by IS_ERR() in __tty_open.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/char/pty.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 31038a0..261223b 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -508,7 +508,7 @@ static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,
 	struct tty_struct *tty = devpts_get_tty(ptm_inode, idx);
 	if (tty)
 		tty = tty->link;
-	return tty;
+	return tty ? : ERR_PTR(-ENODEV);
 }
 
 /**
-- 
1.6.1.2