Skip to content

Commit 309cf37

Browse files
miniplidavem330
authored andcommitted
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: eea68e2 ("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>
1 parent 41015e8 commit 309cf37

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

net/packet/af_packet.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3521,6 +3521,7 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq)
35213521
i->ifindex = mreq->mr_ifindex;
35223522
i->alen = mreq->mr_alen;
35233523
memcpy(i->addr, mreq->mr_address, i->alen);
3524+
memset(i->addr + i->alen, 0, sizeof(i->addr) - i->alen);
35243525
i->count = 1;
35253526
i->next = po->mclist;
35263527
po->mclist = i;

0 commit comments

Comments
 (0)