diff options
| author | mav <mav@FreeBSD.org> | 2008-11-08 06:25:57 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2008-11-08 06:25:57 +0000 |
| commit | ef99a9576fc6beeae0c584a05e1f90d37b9bf18f (patch) | |
| tree | a3aad7de5faa584b08b414c3ab96a7a2e9de5e22 | |
| parent | c1676b587be226dbc880e81381ba9c7307276a0c (diff) | |
| download | FreeBSD-src-ef99a9576fc6beeae0c584a05e1f90d37b9bf18f.zip FreeBSD-src-ef99a9576fc6beeae0c584a05e1f90d37b9bf18f.tar.gz | |
Don't use curthread to resolve file descriptor. Request may be queued, so
thread will be different. Instead require sender to send process ID
together with file descriptor.
| -rw-r--r-- | sys/netgraph/ng_tty.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c index 5cab971..c504b84 100644 --- a/sys/netgraph/ng_tty.c +++ b/sys/netgraph/ng_tty.c @@ -73,6 +73,7 @@ #include <sys/syslog.h> #include <sys/tty.h> #include <sys/ttycom.h> +#include <sys/proc.h> #include <net/if.h> #include <net/if_var.h> @@ -250,7 +251,8 @@ ngt_shutdown(node_p node) static int ngt_rcvmsg(node_p node, item_p item, hook_p lasthook) { - struct thread *td = curthread; /* XXX */ + struct proc *p; + struct thread *td; const sc_p sc = NG_NODE_PRIVATE(node); struct ng_mesg *msg, *resp = NULL; int error = 0; @@ -262,8 +264,14 @@ ngt_rcvmsg(node_p node, item_p item, hook_p lasthook) case NGM_TTY_SET_TTY: if (sc->tp != NULL) return (EBUSY); - error = ttyhook_register(&sc->tp, td, *(int *)msg->data, + + p = pfind(((int *)msg->data)[0]); + if (p == NULL) + return (ESRCH); + td = FIRST_THREAD_IN_PROC(p); + error = ttyhook_register(&sc->tp, td, ((int *)msg->data)[1], &ngt_hook, sc); + PROC_UNLOCK(p); if (error != 0) return (error); break; |
