diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:37 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:37 +0800 |
commit | 510d0a3f869611dcd001a2b7627fa5dded4579af (patch) | |
tree | ba06ce27af2f3aa194a268e3f26f0665c21357a9 /net/packet/af_packet.c | |
parent | e37ddf27108a992e191b27df9bd532cb9157dc89 (diff) | |
parent | 544ec5b08d007f184ab97abdbed87e613c8c0b83 (diff) |
Merge tag 'v4.4.11' into linux-linaro-lsk-v4.4lsk-v4.4-16.05
This is the 4.4.11 stable release
Diffstat (limited to 'net/packet/af_packet.c')
-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 da1ae0e13cb5..9cc7b512b472 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3436,6 +3436,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; |