diff options
| author | ae <ae@FreeBSD.org> | 2014-12-16 11:45:33 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2014-12-16 11:45:33 +0000 |
| commit | 257146dad418dd27229c22880997bbc505ee2e07 (patch) | |
| tree | 600a223c94978b4a5e87dd56f7738f72da05286a /sys/netipsec | |
| parent | 6fc2bb76afe442ed3756e1a4ccf889430c6b0134 (diff) | |
| download | FreeBSD-src-257146dad418dd27229c22880997bbc505ee2e07.zip FreeBSD-src-257146dad418dd27229c22880997bbc505ee2e07.tar.gz | |
MFC r275393:
Remove unneded check. No need to do m_pullup to the size that we prepended.
MFC r275473:
Fix style(9) and remove m_freem(NULL).
Add XXX comment, it looks incorrect, because m_pkthdr.len is already
incremented by M_PREPEND().
Sponsored by: Yandex LLC
Diffstat (limited to 'sys/netipsec')
| -rw-r--r-- | sys/netipsec/keysock.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 5a6b84a..5fc5998 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -149,14 +149,11 @@ key_sendup0(rp, m, promisc) struct sadb_msg *pmsg; M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT); - if (m && m->m_len < sizeof(struct sadb_msg)) - m = m_pullup(m, sizeof(struct sadb_msg)); - if (!m) { + if (m == NULL) { PFKEYSTAT_INC(in_nomem); - m_freem(m); - return ENOBUFS; + return (ENOBUFS); } - m->m_pkthdr.len += sizeof(*pmsg); + m->m_pkthdr.len += sizeof(*pmsg); /* XXX: is this correct? */ pmsg = mtod(m, struct sadb_msg *); bzero(pmsg, sizeof(*pmsg)); |
