1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 9fbb2eba9a06..449a9825200d 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -756,6 +756,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
 
         /* Try to dequeue as many skbs from reorder_q as we can. */
         pppol2tp_recv_dequeue(session);
+        sock_put(sock);
 
         return 0;
 
@@ -772,6 +773,7 @@ discard_bad_csum:
         UDP_INC_STATS_USER(&init_net, UDP_MIB_INERRORS, 0);
         tunnel->stats.rx_errors++;
         kfree_skb(skb);
+        sock_put(sock);
 
         return 0;
 
@@ -1180,7 +1182,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         /* Calculate UDP checksum if configured to do so */
         if (sk_tun->sk_no_check == UDP_CSUM_NOXMIT)
                 skb->ip_summed = CHECKSUM_NONE;
-        else if (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM)) {
+        else if ((skb_dst(skb) && skb_dst(skb)->dev) &&
+                 (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM))) {
                 skb->ip_summed = CHECKSUM_COMPLETE;
                 csum = skb_checksum(skb, 0, udp_len, 0);
                 uh->check = csum_tcpudp_magic(inet->inet_saddr,
@@ -1661,6 +1664,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
                 if (tunnel_sock == NULL)
                         goto end;
 
+                sock_hold(tunnel_sock);
                 tunnel = tunnel_sock->sk_user_data;
         } else {
                 tunnel = pppol2tp_tunnel_find(sock_net(sk), sp->pppol2tp.s_tunnel);