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

Carefully handle memory errors to keep peers compression/encryption state

Browse Source 
consistent. There are some cases reported where peers fatally getting out
of sync without any visible reason. I hope this solve the problem.
This commit is contained in:
Alexander Motin 2008-12-06 23:00:48 +00:00
parent d493985afd
commit 11d1cade73
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=185723
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/netgraph/ng_mppc.c
View File

@ -492,17 +492,18 @@ ng_mppc_compress(node_p node, struct mbuf **datap)
/* Work with contiguous regions of memory. */
inlen = m->m_pkthdr.len;
inbuf = malloc(inlen, M_NETGRAPH_MPPC, M_NOWAIT);
if (inbuf == NULL) {
m_freem(m);
return (ENOMEM);
}
if (inbuf == NULL)
goto err1;
m_copydata(m, 0, inlen, (caddr_t)inbuf);
outlen = MPPC_MAX_BLOWUP(inlen);
outbuf = malloc(outlen, M_NETGRAPH_MPPC, M_NOWAIT);
if (outbuf == NULL) {
m_freem(m);
free(inbuf, M_NETGRAPH_MPPC);
err1:
m_freem(m);
MPPC_InitCompressionHistory(d->history);
d->flushed = 1;
return (ENOMEM);
}
@ -538,8 +539,13 @@ ng_mppc_compress(node_p node, struct mbuf **datap)
free(outbuf, M_NETGRAPH_MPPC);
/* Check m_devget() result. */
if (m == NULL)
if (m == NULL) {
if (!d->flushed) {
MPPC_InitCompressionHistory(d->history);
d->flushed = 1;
}
return (ENOMEM);
}
}
#endif
@ -551,6 +557,18 @@ ng_mppc_compress(node_p node, struct mbuf **datap)
/* Set header bits */
header |= MPPC_FLAG_ENCRYPTED;
/* We must own the mbuf chain exclusively to modify it. */
m = m_unshare(m, M_DONTWAIT);
if (m == NULL) {
if (!d->flushed) {
#ifdef NETGRAPH_MPPC_COMPRESSION
MPPC_InitCompressionHistory(d->history);
#endif
d->flushed = 1;
}
return (ENOMEM);
}
/* Update key if it's time */
if ((d->cfg.bits & MPPE_STATELESS) != 0
|| (d->cc & MPPE_UPDATE_MASK) == MPPE_UPDATE_FLAG) {
@ -562,11 +580,6 @@ ng_mppc_compress(node_p node, struct mbuf **datap)
rc4_init(&d->rc4, d->key, KEYLEN(d->cfg.bits));
}
/* We must own the mbuf chain exclusively to modify it. */
m = m_unshare(m, M_DONTWAIT);
if (m == NULL)
return (ENOMEM);
/* Encrypt packet */
m1 = m;
while (m1) {