Page MenuHomeFreeBSD
Files F177287927

D37025.1794095614.diff
No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

D37025.1794095614.diff
View Options

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1130,11 +1130,12 @@
NET_EPOCH_ASSERT();
KASSERT(laddr != NULL, ("%s: laddr NULL", __func__));
+
/*
* Bypass source address selection and use the primary jail IP
* if requested.
*/
- if (cred != NULL && !prison_saddrsel_ip4(cred, laddr))
+ if (!prison_saddrsel_ip4(cred, laddr))
return (0);
error = 0;
@@ -1179,7 +1180,7 @@
goto done;
}
- if (cred == NULL || !prison_flag(cred, PR_IP4)) {
+ if (!prison_flag(cred, PR_IP4)) {
laddr->s_addr = ia->ia_addr.sin_addr.s_addr;
goto done;
}
@@ -1220,7 +1221,7 @@
struct ifnet *ifp;
/* If not jailed, use the default returned. */
- if (cred == NULL || !prison_flag(cred, PR_IP4)) {
+ if (!prison_flag(cred, PR_IP4)) {
ia = (struct in_ifaddr *)nh->nh_ifa;
laddr->s_addr = ia->ia_addr.sin_addr.s_addr;
goto done;
@@ -1281,7 +1282,7 @@
if (ia == NULL)
ia = ifatoia(ifa_ifwithaddr(sintosa(&dst)));
- if (cred == NULL || !prison_flag(cred, PR_IP4)) {
+ if (!prison_flag(cred, PR_IP4)) {
if (ia == NULL) {
error = ENETUNREACH;
goto done;
@@ -1392,8 +1393,7 @@
if (faddr.s_addr == INADDR_ANY) {
faddr =
IA_SIN(CK_STAILQ_FIRST(&V_in_ifaddrhead))->sin_addr;
- if (cred != NULL &&
- (error = prison_get_ip4(cred, &faddr)) != 0)
+ if ((error = prison_get_ip4(cred, &faddr)) != 0)
return (error);
} else if (faddr.s_addr == (u_long)INADDR_BROADCAST) {
if (CK_STAILQ_FIRST(&V_in_ifaddrhead)->ia_ifp->if_flags &
@@ -1418,10 +1418,9 @@
if (imo->imo_multicast_ifp != NULL) {
ifp = imo->imo_multicast_ifp;
CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) {
- if ((ia->ia_ifp == ifp) &&
- (cred == NULL ||
+ if (ia->ia_ifp == ifp &&
prison_check_ip4(cred,
- &ia->ia_addr.sin_addr) == 0))
+ &ia->ia_addr.sin_addr) == 0)
break;
}
if (ia == NULL)
@@ -2067,9 +2066,8 @@
/*
* Found?
*/
- if (cred == NULL ||
- prison_equal_ip4(cred->cr_prison,
- inp->inp_cred->cr_prison))
+ if (prison_equal_ip4(cred->cr_prison,
+ inp->inp_cred->cr_prison))
return (inp);
}
}
@@ -2100,9 +2098,8 @@
*/
CK_LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) {
wildcard = 0;
- if (cred != NULL &&
- !prison_equal_ip4(inp->inp_cred->cr_prison,
- cred->cr_prison))
+ if (!prison_equal_ip4(inp->inp_cred->cr_prison,
+ cred->cr_prison))
continue;
#ifdef INET6
/* XXX inp locking */
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -749,9 +749,8 @@
IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) &&
inp->inp_lport == lport) {
/* Found. */
- if (cred == NULL ||
- prison_equal_ip6(cred->cr_prison,
- inp->inp_cred->cr_prison))
+ if (prison_equal_ip6(cred->cr_prison,
+ inp->inp_cred->cr_prison))
return (inp);
}
}
@@ -782,9 +781,8 @@
*/
CK_LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) {
wildcard = 0;
- if (cred != NULL &&
- !prison_equal_ip6(cred->cr_prison,
- inp->inp_cred->cr_prison))
+ if (!prison_equal_ip6(cred->cr_prison,
+ inp->inp_cred->cr_prison))
continue;
/* XXX inp locking */
if ((inp->inp_vflag & INP_IPV6) == 0)

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 7, 11:53 PM (9 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41557160
Default Alt Text
D37025.1794095614.diff (3 KB)

Event Timeline