1 files changed, 3 insertions, 2 deletions

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 8dab4e569571..8ae3ed97d95c 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -38,7 +38,7 @@ static u16 llc_ui_sap_link_no_max[256];
 static struct sockaddr_llc llc_ui_addrnull;
 static const struct proto_ops llc_ui_ops;
 
-static int llc_ui_wait_for_conn(struct sock *sk, long timeout);
+static long llc_ui_wait_for_conn(struct sock *sk, long timeout);
 static int llc_ui_wait_for_disc(struct sock *sk, long timeout);
 static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);
 
@@ -551,7 +551,7 @@ static int llc_ui_wait_for_disc(struct sock *sk, long timeout)
         return rc;
 }
 
-static int llc_ui_wait_for_conn(struct sock *sk, long timeout)
+static long llc_ui_wait_for_conn(struct sock *sk, long timeout)
 {
         DEFINE_WAIT(wait);
 
@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb)
         if (llc->cmsg_flags & LLC_CMSG_PKTINFO) {
                 struct llc_pktinfo info;
 
+                memset(&info, 0, sizeof(info));
                 info.lpi_ifindex = llc_sk(skb->sk)->dev->ifindex;
                 llc_pdu_decode_dsap(skb, &info.lpi_sap);
                 llc_pdu_decode_da(skb, info.lpi_mac);