sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pty range improvement

Browse source
This commit is contained in:
Ben Gras 2014-06-16 19:27:46 +02:00 committed by Lionel Sambuc
parent b41d3ab74e
commit cbb688a05d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/pty/pty.c
View file

@ -93,6 +93,8 @@ static int pty_master_open(devminor_t minor, int UNUSED(access),
tty_t *tp; tty_t *tp;
pty_t *pp; pty_t *pp;
assert(minor >= PTYPX_MINOR && minor < PTYPX_MINOR + NR_PTYS);
if ((tp = line2tty(minor)) == NULL) if ((tp = line2tty(minor)) == NULL)
return ENXIO; return ENXIO;
pp = tp->tty_priv; pp = tp->tty_priv;
@ -538,6 +540,8 @@ static int pty_slave_open(tty_t *tp, int UNUSED(try))
/* The tty side has been opened. */ /* The tty side has been opened. */
pty_t *pp = tp->tty_priv; pty_t *pp = tp->tty_priv;
assert(tp->tty_minor >= TTYPX_MINOR && tp->tty_minor < TTYPX_MINOR + NR_PTYS);
/* TTY_ACTIVE may already be set, which would indicate that the slave is /* TTY_ACTIVE may already be set, which would indicate that the slave is
* reopened after being fully closed while the master is still open. In that * reopened after being fully closed while the master is still open. In that
* case TTY_CLOSED will also be set, so clear that one. * case TTY_CLOSED will also be set, so clear that one.

2
drivers/pty/tty.c
View file

@ -143,7 +143,7 @@ int main(void)
if (OK != chardriver_get_minor(&tty_mess, &line)) if (OK != chardriver_get_minor(&tty_mess, &line))
continue; continue;
if (line - PTYPX_MINOR < NR_PTYS && if ((line >= PTYPX_MINOR) && (line < (PTYPX_MINOR + NR_PTYS)) &&
tty_mess.m_type != CDEV_IOCTL) { tty_mess.m_type != CDEV_IOCTL) {
/* Terminals and pseudo terminals belong together. We can only /* Terminals and pseudo terminals belong together. We can only
* make a distinction between the two based on position in the * make a distinction between the two based on position in the