[PATCH 3.16 024/114] packet: fix heap info leak in PACKET_DIAG_MCLIST sock_diag interface
From: Ben Hutchings <hidden>
Date: 2016-06-13 18:43:39
Also in:
lkml
From: Ben Hutchings <hidden>
Date: 2016-06-13 18:43:39
Also in:
lkml
3.16.36-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <redacted>
commit 309cf37fe2a781279b7675d4bb7173198e532867 upstream.
Because we miss to wipe the remainder of i->addr[] in packet_mc_add(),
pdiag_put_mclist() leaks uninitialized heap bytes via the
PACKET_DIAG_MCLIST netlink attribute.
Fix this by explicitly memset(0)ing the remaining bytes in i->addr[].
Fixes: eea68e2f1a00 ("packet: Report socket mclist info via diag module")
Signed-off-by: Mathias Krause <redacted>
Cc: Eric W. Biederman <redacted>
Cc: Pavel Emelyanov <redacted>
Acked-by: Pavel Emelyanov <redacted>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <redacted>
---
net/packet/af_packet.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c@@ -3155,6 +3155,7 @@ static int packet_mc_add(struct sock *sk i->ifindex = mreq->mr_ifindex; i->alen = mreq->mr_alen; memcpy(i->addr, mreq->mr_address, i->alen); + memset(i->addr + i->alen, 0, sizeof(i->addr) - i->alen); i->count = 1; i->next = po->mclist; po->mclist = i;