From 0b3fdbfa5200ef73e1c802d77fff9038a710bad1 Mon Sep 17 00:00:00 2001 From: ru Date: Tue, 23 Dec 2003 13:33:23 +0000 Subject: [PATCH] Fix a problem introduced in revision 1.84: m_pullup() does not necessarily return the same mbuf chain so we need to recompute mtod() consumers after pulling up. --- sys/netinet/if_ether.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index c5238cfc7ef..34f820d6291 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -530,11 +530,13 @@ arpintr(struct mbuf *m) return; } - if (m->m_pkthdr.len < arphdr_len(ar) && - (m = m_pullup(m, arphdr_len(ar))) == NULL) { - log(LOG_ERR, "arp: runt packet\n"); - m_freem(m); - return; + if (m->m_pkthdr.len < arphdr_len(ar)) { + if ((m = m_pullup(m, arphdr_len(ar))) == NULL) { + log(LOG_ERR, "arp: runt packet\n"); + m_freem(m); + return; + } + ar = mtod(m, struct arphdr *); } switch (ntohs(ar->ar_pro)) { -- 2.45.2