diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2001-10-04 12:59:53 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2001-10-04 12:59:53 +0000 |
| commit | 4be03ca19ce7cfb3e45552731a7a9122795847c4 (patch) | |
| tree | becafd7eb7c2a2f67a7020af2d78252afd1210d5 /sys/kern/uipc_sockbuf.c | |
| parent | 04d18a71512c0c3ab6e5bcf58fdd4835a1f12ee1 (diff) | |
| download | FreeBSD-src-4be03ca19ce7cfb3e45552731a7a9122795847c4.zip FreeBSD-src-4be03ca19ce7cfb3e45552731a7a9122795847c4.tar.gz | |
Allow sbcreatecontrol to make cluster sized control messages.
Diffstat (limited to 'sys/kern/uipc_sockbuf.c')
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index b7042ff..b0c23fd 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -851,13 +851,23 @@ sbcreatecontrol(p, size, type, level) register struct cmsghdr *cp; struct mbuf *m; - if (CMSG_SPACE((u_int)size) > MLEN) + if (CMSG_SPACE((u_int)size) > MCLBYTES) return ((struct mbuf *) NULL); if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL) return ((struct mbuf *) NULL); + if (CMSG_SPACE((u_int)size) > MLEN) { + MCLGET(m, M_DONTWAIT); + if ((m->m_flags & M_EXT) == 0) { + m_free(m); + return ((struct mbuf *) NULL); + } + } cp = mtod(m, struct cmsghdr *); - /* XXX check size? */ - (void)memcpy(CMSG_DATA(cp), p, size); + m->m_len = 0; + KASSERT(CMSG_SPACE((u_int)size) <= M_TRAILINGSPACE(m), + ("sbcreatecontrol: short mbuf")); + if (p != NULL) + (void)memcpy(CMSG_DATA(cp), p, size); m->m_len = CMSG_SPACE(size); cp->cmsg_len = CMSG_LEN(size); cp->cmsg_level = level; |
