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

Fix a bug overwriting random data when Van Jacobsen header compression

Browse Source 
was used with the isp/isppp driver.
Submitted by:	Sergio de Souza Prallon <prallon@tmp.com.br>
This commit is contained in:
hm 2001-01-12 08:48:54 +00:00
parent 0a7d951162
commit 464b4ea94b
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/i4b/driver/i4b_ispppsubr.c
View File

@ -486,9 +486,10 @@ isppp_input(struct ifnet *ifp, struct mbuf *m)
SPP_FMT "input packet is too small, %d bytes\n",
SPP_ARGS(ifp), m->m_pkthdr.len);
drop:
m_freem (m);
drop2:
++ifp->if_ierrors;
++ifp->if_iqdrops;
m_freem (m);
return;
}
@ -554,26 +555,35 @@ isppp_input(struct ifnet *ifp, struct mbuf *m)
#ifdef SPPP_VJ
case PPP_VJ_COMP:
if (sp->state[IDX_IPCP] == STATE_OPENED) {
int len;
u_char *iphdr;
int hlen, vjlen;
if ((len = sl_uncompress_tcp(
(u_char **)&m->m_data, m->m_len,
TYPE_COMPRESSED_TCP, &sp->pp_comp)) <= 0)
if ((vjlen = sl_uncompress_tcp_core(m->m_data,
m->m_len, m->m_len, TYPE_COMPRESSED_TCP,
&sp->pp_comp, &iphdr, &hlen)) <= 0)
goto drop;
m->m_len = m->m_pkthdr.len = len;
m_adj(m, vjlen);
M_PREPEND(m, hlen, M_DONTWAIT);
if (m == NULL)
goto drop2;
bcopy(iphdr, mtod(m, u_char *), hlen);
schednetisr (NETISR_IP);
inq = &ipintrq;
}
break;
case PPP_VJ_UCOMP:
if (sp->state[IDX_IPCP] == STATE_OPENED) {
int len;
u_char *iphdr;
int hlen, vjlen;
if ((len = sl_uncompress_tcp(
(u_char **)&m->m_data, m->m_len,
TYPE_UNCOMPRESSED_TCP, &sp->pp_comp)) <= 0)
if ((vjlen = sl_uncompress_tcp_core(m->m_data,
m->m_len, m->m_len, TYPE_COMPRESSED_TCP,
&sp->pp_comp, &iphdr, &hlen)) <= 0)
goto drop;
m->m_len = m->m_pkthdr.len = len;
schednetisr (NETISR_IP);
inq = &ipintrq;
}