d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fallout from r241923. Calculate length of payload in

Browse Source 
pim_input() properly.

While here, remove extra variable and incorrect condition
before m_pullup().

Reported by:	Olivier Cochard-Labbé <olivier cochard.me>
Sponsored by:	Nginx, Inc.
This commit is contained in:
Gleb Smirnoff 2014-01-22 10:57:42 +00:00
parent 2e74d8c857
commit 547246a373
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/ip_mroute.c
View File

@ -2557,14 +2557,13 @@ pim_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
* is passed to if_simloop().
*/
void
pim_input(struct mbuf *m, int off)
pim_input(struct mbuf *m, int iphlen)
{
struct ip *ip = mtod(m, struct ip *);
struct pim *pim;
int minlen;
int datalen = ntohs(ip->ip_len);
int datalen = ntohs(ip->ip_len) - iphlen;
int ip_tos;
int iphlen = off;
/* Keep statistics */
PIMSTAT_INC(pims_rcv_total_msgs);
@ -2594,8 +2593,7 @@ pim_input(struct mbuf *m, int off)
* Get the IP and PIM headers in contiguous memory, and
* possibly the PIM REGISTER header.
*/
if ((m->m_flags & M_EXT || m->m_len < minlen) &&
(m = m_pullup(m, minlen)) == 0) {
if (m->m_len < minlen && (m = m_pullup(m, minlen)) == 0) {
CTR1(KTR_IPMF, "%s: m_pullup() failed", __func__);
return;
}