diff --git a/[refs] b/[refs] index 21b4af976718..7be66b499096 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d26d6504f23e803824e8ebd14e52d4fc0a0b09cb +refs/heads/master: 4a184233f21645cf0b719366210ed445d1024d72 diff --git a/trunk/net/rose/af_rose.c b/trunk/net/rose/af_rose.c index cf68e6e4054a..9c8347451597 100644 --- a/trunk/net/rose/af_rose.c +++ b/trunk/net/rose/af_rose.c @@ -1253,6 +1253,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); if (srose != NULL) { + memset(srose, 0, msg->msg_namelen); srose->srose_family = AF_ROSE; srose->srose_addr = rose->dest_addr; srose->srose_call = rose->dest_call;