diff options
| author | Mathias Krause <minipli@googlemail.com> | 2016-04-10 12:52:28 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 23:07:21 -0400 |
| commit | 4b5223be98e1972e177f319159a29eb3bab2720e (patch) | |
| tree | e4b643be8b5937bfb7463d123964649ec6e8ac9e | |
| parent | 80565d16c385958217a0c204f19475ce8210e64a (diff) | |
packet: fix heap info leak in PACKET_DIAG_MCLIST sock_diag interface
[ Upstream commit 309cf37fe2a781279b7675d4bb7173198e532867 ]
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 <minipli@googlemail.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | net/packet/af_packet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 68a048472e5f..a3654d929814 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3207,6 +3207,7 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq) 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; |