svn commit: r345257 - stable/11/sys/netpfil/ipfw/nat64

[Andrey V. Elsukov]

Author: ae
Date: Mon Mar 18 09:23:15 2019
New Revision: 345257
URL: https://svnweb.freebsd.org/changeset/base/345257

Log:
  MFC r345003:
    Add NULL pointer check to nat64_output().
  
    It is possible that a processed packet was originated by local host,
    in this case m->m_pkthdr.rcvif is NULL. Check and set it to V_loif to
    avoid NULL pointer dereference in IP input code, since it is expected
    that packet has valid receiving interface when netisr processes it.
  
    Obtained from:        Yandex LLC
    Sponsored by: Yandex LLC

Modified:
  stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c
==============================================================================
--- stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c	Mon Mar 18 09:21:30 2019	(r345256)
+++ stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c	Mon Mar 18 09:23:15 2019	(r345257)
@@ -179,6 +179,8 @@ nat64_output(struct ifnet *ifp, struct mbuf *m, struct
 	}
 	if (logdata != NULL)
 		nat64_log(logdata, m, af);
+	if (m->m_pkthdr.rcvif == NULL)
+		m->m_pkthdr.rcvif = V_loif;
 	ret = netisr_queue(ret, m);
 	if (ret != 0)
 		NAT64STAT_INC(stats, oerrors);