D36322.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D36322.diff
View Options

	diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
	--- a/sys/compat/freebsd32/freebsd32_misc.c
	+++ b/sys/compat/freebsd32/freebsd32_misc.c
	@@ -1535,6 +1535,7 @@
	u_int msglen, outlen;
	int error;

	+ /* Enforce the size limit of the native implementation. */
	if (buflen > MCLBYTES)
	return (EINVAL);

	@@ -1570,20 +1571,20 @@
	outlen += CMSG_ALIGN(sizeof(*cm)) +
	CMSG_ALIGN(msglen - FREEBSD32_ALIGN(sizeof(*cm)));
	}
	- if (error == 0 && outlen > MCLBYTES) {
	- /*
	- * XXXMJ This implies that the upper limit on 32-bit aligned
	- * control messages is less than MCLBYTES, and so we are not
	- * perfectly compatible. However, there is no platform
	- * guarantee that mbuf clusters larger than MCLBYTES can be
	- * allocated.
	- */
	- error = EINVAL;
	- }
	if (error != 0)
	goto out;

	+ /*
	+ * Allocate up to MJUMPAGESIZE space for the re-aligned and
	+ * re-padded control messages. This allows a full MCLBYTES of
	+ * 32-bit sized and aligned messages to fit and avoids an ABI
	+ * mismatch with the native implementation.
	+ */
	m = m_get2(outlen, M_WAITOK, MT_CONTROL, 0);
	+ if (m == NULL) {
	+ error = EINVAL;
	+ goto out;
	+ }
	m->m_len = outlen;
	md = mtod(m, void *);