From: claudio <claudio@openbsd.org>
Date: Tue, 6 Oct 2015 14:38:32 +0000 (+0000)
Subject: Make sure that all padding bytes in cmsgs are actually zero by memset
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7ac81437ffee1530fa919fca5e95b8a14eb57f02;p=openbsd

Make sure that all padding bytes in cmsgs are actually zero by memset
CMSG_SIZE(len) bytes of the mbuf.
---

diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 72064f08861..dc8f23c9b2b 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket2.c,v 1.62 2015/07/08 07:21:50 mpi Exp $	*/
+/*	$OpenBSD: uipc_socket2.c,v 1.63 2015/10/06 14:38:32 claudio Exp $	*/
 /*	$NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $	*/
 
 /*
@@ -938,6 +938,7 @@ sbcreatecontrol(caddr_t p, int size, int type, int level)
 		}
 	}
 	cp = mtod(m, struct cmsghdr *);
+	memset(cp, 0, CMSG_SPACE(size));
 	memcpy(CMSG_DATA(cp), p, size);
 	m->m_len = CMSG_SPACE(size);
 	cp->cmsg_len = CMSG_LEN(size);