The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=81674f121eeb741625a21ea5acf29d7580153817
commit 81674f121eeb741625a21ea5acf29d7580153817 Author: Gleb Smirnoff <[email protected]> AuthorDate: 2021-11-12 16:58:27 +0000 Commit: Gleb Smirnoff <[email protected]> CommitDate: 2021-11-12 16:58:27 +0000 ip_input: packet filters shall not modify m_pkthdr.rcvif Quick review confirms that they do not, also IPv6 doesn't expect such a change in mbuf. In IPv4 this appeared in 0aade26e6d061, which doesn't seem to have a valid explanation why. Reviewed by: donner, kp, melifaro Differential revision: https://reviews.freebsd.org/D32913 --- sys/netinet/ip_input.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 91fc7a3a63f7..a678c15caad5 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -607,7 +607,6 @@ tooshort: ip = mtod(m, struct ip *); dchg = (odst.s_addr != ip->ip_dst.s_addr); - ifp = m->m_pkthdr.rcvif; if (m->m_flags & M_FASTFWD_OURS) { m->m_flags &= ~M_FASTFWD_OURS; @@ -665,7 +664,7 @@ passin: * checked it with carp_iamatch() and carp_forus(). */ strong_es = V_ip_strong_es && (V_ipforwarding == 0) && - ifp != NULL && ((ifp->if_flags & IFF_LOOPBACK) == 0) && + ((ifp->if_flags & IFF_LOOPBACK) == 0) && ifp->if_carp == NULL && (dchg == 0); /* @@ -697,7 +696,7 @@ passin: * be handled via ip_forward() and ether_output() with the loopback * into the stack for SIMPLEX interfaces handled by ether_output(). */ - if (ifp != NULL && ifp->if_flags & IFF_BROADCAST) { + if (ifp->if_flags & IFF_BROADCAST) { CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != AF_INET) continue;
