diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-09-30 00:49:55 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-09-30 00:49:55 +0000 |
| commit | 473ce53fa4bbfd9543372f4a44b7056330c565dd (patch) | |
| tree | 74388429e2c1cd4eceda28772a1edb9dc525c435 /sys/netkey/key.c | |
| parent | cab5e018dd814a3c77b615727a9552396dc9b547 (diff) | |
| download | FreeBSD-src-473ce53fa4bbfd9543372f4a44b7056330c565dd.zip FreeBSD-src-473ce53fa4bbfd9543372f4a44b7056330c565dd.tar.gz | |
Merge netipsec/key.c:1.17 into KAME pfkey implementation:
date: 2004/09/26 02:01:27; author: sam; state: Exp; lines: +0 -5
Correct handling of SADB_UPDATE and SADB_ADD requests. key_align may
split the mbuf due to use of m_pulldown. Discarding the result because
of this does not make sense as no subsequent code depends on the entire
msg being linearized (only the individual pieces). It's likely
something else is wrong here but for now this appears to get things back
to a working state.
Submitted by: Roselyn Lee
This change was also made in the KAME CVS repository as key.c:1.337 by
itojun.
Diffstat (limited to 'sys/netkey/key.c')
| -rw-r--r-- | sys/netkey/key.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c index c60772d..15bdbea 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -6952,11 +6952,6 @@ key_parse(m, so) if (error) return error; - if (m->m_next) { /*XXX*/ - m_freem(m); - return ENOBUFS; - } - msg = mh.msg; /* check SA type */ |
