diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_pcb.c | 6 | ||||
| -rw-r--r-- | sys/netinet/in_pcb.h | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_divert.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index be95188..b4de80a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1031,11 +1031,11 @@ in_pcbremlists(inp) } int -prison_xinpcb(struct proc *p, struct inpcb *inp) +prison_xinpcb(struct thread *td, struct inpcb *inp) { - if (!jailed(p->p_ucred)) + if (!jailed(td->td_ucred)) return (0); - if (ntohl(inp->inp_laddr.s_addr) == prison_getip(p->p_ucred)) + if (ntohl(inp->inp_laddr.s_addr) == prison_getip(td->td_ucred)) return (0); return (1); } diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 74f3a94..b1010d9 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -329,7 +329,7 @@ void in_pcbrehash(struct inpcb *); int in_setpeeraddr(struct socket *so, struct sockaddr **nam); int in_setsockaddr(struct socket *so, struct sockaddr **nam); void in_pcbremlists(struct inpcb *inp); -int prison_xinpcb(struct proc *p, struct inpcb *inp); +int prison_xinpcb(struct thread *td, struct inpcb *inp); #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 5650d26..d022f72 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -487,8 +487,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS) s = splnet(); for (inp = LIST_FIRST(divcbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { - if (inp->inp_gencnt <= gencnt && !prison_xinpcb( - req->td->td_proc, inp)) + if (inp->inp_gencnt <= gencnt && !prison_xinpcb(req->td, inp)) inp_list[i++] = inp; } splx(s); |
