Page MenuHomeFreeBSD
Files F107314140

D38068.diff
No OneTemporary
Actions

D38068.diff
View Options

diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -818,6 +818,25 @@
return (V_spd_size != 0);
}
+/*
+ * Allocate a single mbuf with a buffer of the desired length. The buffer is
+ * pre-zeroed to help ensure that uninitialized pad bytes are not leaked.
+ */
+static struct mbuf *
+key_mget(u_int len)
+{
+ struct mbuf *m;
+
+ KASSERT(len <= MCLBYTES,
+ ("%s: invalid buffer length %u", __func__, len));
+
+ m = m_get2(len, M_NOWAIT, MT_DATA, M_PKTHDR);
+ if (m == NULL)
+ return (NULL);
+ memset(mtod(m, void *), 0, len);
+ return (m);
+}
+
/* %%% IPsec policy management */
/*
* Return current SPDB generation.
@@ -2353,14 +2372,8 @@
/* create new sadb_msg to reply. */
len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (n && len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_freem(n);
- n = NULL;
- }
- }
- if (!n)
+ n = key_mget(len);
+ if (n == NULL)
return key_senderror(so, m, ENOBUFS);
n->m_len = len;
@@ -3792,14 +3805,8 @@
len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
if (len > MCLBYTES)
return NULL;
- MGETHDR(m, M_NOWAIT, MT_DATA);
- if (m && len > MHLEN) {
- if (!(MCLGET(m, M_NOWAIT))) {
- m_freem(m);
- m = NULL;
- }
- }
- if (!m)
+ m = key_mget(len);
+ if (m == NULL)
return NULL;
m->m_pkthdr.len = m->m_len = len;
m->m_next = NULL;
@@ -4979,14 +4986,8 @@
len = PFKEY_ALIGN8(sizeof(struct sadb_msg)) +
PFKEY_ALIGN8(sizeof(struct sadb_sa));
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_freem(n);
- n = NULL;
- }
- }
- if (!n) {
+ n = key_mget(len);
+ if (n == NULL) {
error = ENOBUFS;
goto fail;
}
@@ -7201,14 +7202,8 @@
if (len > MCLBYTES)
return key_senderror(so, m, ENOBUFS);
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (n != NULL && len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_freem(n);
- n = NULL;
- }
- }
- if (!n)
+ n = key_mget(len);
+ if (n == NULL)
return key_senderror(so, m, ENOBUFS);
n->m_pkthdr.len = n->m_len = len;
@@ -7839,14 +7834,8 @@
if (m->m_next) {
struct mbuf *n;
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (n && m->m_pkthdr.len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_free(n);
- n = NULL;
- }
- }
- if (!n) {
+ n = key_mget(m->m_pkthdr.len);
+ if (n == NULL) {
m_freem(m);
return ENOBUFS;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 13, 9:53 AM (21 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15780205
Default Alt Text
D38068.diff (2 KB)

Event Timeline