mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-14 08:44:27 +08:00
Update to FreeBSD head 2018-12-20
Git mirror commit 19a6ceb89dbacf74697d493e48c388767126d418. It includes an update of wpa_supplicant to version 2.7. It includes an update of the OpenSSL baseline to version 1.1.1a. Update #3472.
This commit is contained in:
@@ -218,12 +218,10 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr *nam,
|
||||
/* GROSS */
|
||||
if (ntohs(lport) <= V_ipport_reservedhigh &&
|
||||
ntohs(lport) >= V_ipport_reservedlow &&
|
||||
priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT,
|
||||
0))
|
||||
priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT))
|
||||
return (EACCES);
|
||||
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr) &&
|
||||
priv_check_cred(inp->inp_cred,
|
||||
PRIV_NETINET_REUSEPORT, 0) != 0) {
|
||||
priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) {
|
||||
t = in6_pcblookup_local(pcbinfo,
|
||||
&sin6->sin6_addr, lport,
|
||||
INPLOOKUP_WILDCARD, cred);
|
||||
@@ -894,8 +892,8 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo,
|
||||
|
||||
INP_HASH_LOCK_ASSERT(pcbinfo);
|
||||
|
||||
hdr = &pcbinfo->ipi_lbgrouphashbase[INP_PCBLBGROUP_PORTHASH(
|
||||
lport, pcbinfo->ipi_lbgrouphashmask)];
|
||||
hdr = &pcbinfo->ipi_lbgrouphashbase[
|
||||
INP_PCBPORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)];
|
||||
|
||||
/*
|
||||
* Order of socket selection:
|
||||
|
@@ -205,7 +205,8 @@ sysctl_mif6table(SYSCTL_HANDLER_ARGS)
|
||||
struct mif6_sctl *out;
|
||||
int error;
|
||||
|
||||
out = malloc(sizeof(struct mif6_sctl) * MAXMIFS, M_TEMP, M_WAITOK);
|
||||
out = malloc(sizeof(struct mif6_sctl) * MAXMIFS, M_TEMP,
|
||||
M_WAITOK | M_ZERO);
|
||||
for (int i = 0; i < MAXMIFS; i++) {
|
||||
out[i].m6_flags = mif6table[i].m6_flags;
|
||||
out[i].m6_rate_limit = mif6table[i].m6_rate_limit;
|
||||
|
@@ -2783,8 +2783,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
|
||||
case IPV6_2292NEXTHOP:
|
||||
case IPV6_NEXTHOP:
|
||||
if (cred != NULL) {
|
||||
error = priv_check_cred(cred,
|
||||
PRIV_NETINET_SETHDROPTS, 0);
|
||||
error = priv_check_cred(cred, PRIV_NETINET_SETHDROPTS);
|
||||
if (error)
|
||||
return (error);
|
||||
}
|
||||
@@ -2842,8 +2841,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
|
||||
* overhead.
|
||||
*/
|
||||
if (cred != NULL) {
|
||||
error = priv_check_cred(cred,
|
||||
PRIV_NETINET_SETHDROPTS, 0);
|
||||
error = priv_check_cred(cred, PRIV_NETINET_SETHDROPTS);
|
||||
if (error)
|
||||
return (error);
|
||||
}
|
||||
@@ -2879,8 +2877,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
|
||||
int destlen;
|
||||
|
||||
if (cred != NULL) { /* XXX: see the comment for IPV6_HOPOPTS */
|
||||
error = priv_check_cred(cred,
|
||||
PRIV_NETINET_SETHDROPTS, 0);
|
||||
error = priv_check_cred(cred, PRIV_NETINET_SETHDROPTS);
|
||||
if (error)
|
||||
return (error);
|
||||
}
|
||||
|
Reference in New Issue
Block a user