summaryrefslogtreecommitdiff
path: root/net/packet
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2016-04-10 13:52:28 +0300
committerDavid S. Miller <davem@davemloft.net>2016-04-14 07:46:39 +0300
commit309cf37fe2a781279b7675d4bb7173198e532867 (patch)
tree90e5bb98299df826738da22e6bee834a2d60fdfd /net/packet
parent41015e89d9ea8b3d94af22bcd8582f6f3f23d9c1 (diff)
downloadlinux-309cf37fe2a781279b7675d4bb7173198e532867.tar.xz
packet: fix heap info leak in PACKET_DIAG_MCLIST sock_diag interface
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>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f12c17f355d9..18d0becbc46d 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3521,6 +3521,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;