Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Truncate mbufs to the correct length before forwarding; fixes pr5560

This commit is contained in:
sommerfe 1998-06-10 00:47:57 +00:00
parent 9e4ad7086e
commit a90d5cd12e
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/netinet/ip_flow.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_flow.c,v 1.5 1998/06/02 15:48:03 thorpej Exp $ */
/* $NetBSD: ip_flow.c,v 1.6 1998/06/10 00:47:57 sommerfe Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -131,6 +131,7 @@ ipflow_fastforward(
struct ipflow *ipf;
struct rtentry *rt;
int error;
int iplen;
/*
* Are we forwarding packets? Big enough for an IP packet?
@ -141,8 +142,9 @@ ipflow_fastforward(
* IP header with no option and valid version and length
*/
ip = mtod(m, struct ip *);
iplen = ntohs(ip->ip_len);
if (ip->ip_v != IPVERSION || ip->ip_hl != (sizeof(struct ip) >> 2) ||
ntohs(ip->ip_len) > m->m_pkthdr.len)
iplen > m->m_pkthdr.len)
return 0;
/*
* Find a flow.
@ -186,6 +188,17 @@ ipflow_fastforward(
ip->ip_sum += htons(IPTTLDEC << 8);
}
/*
* Trim the packet in case it's too long..
*/
if (m->m_pkthdr.len > iplen) {
if (m->m_len == m->m_pkthdr.len) {
m->m_len = iplen;
m->m_pkthdr.len = iplen;
} else
m_adj(m, iplen - m->m_pkthdr.len);
}
/*
* Send the packet on it's way. All we can get back is ENOBUFS
*/