5 files changed, 16 insertions, 9 deletions

diff --git a/net/802/psnap.c b/net/802/psnap.c
index 04ee43e7538f..31128cb92a23 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -55,6 +55,9 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
                 .type = __constant_htons(ETH_P_SNAP),
         };
 
+        if (unlikely(!pskb_may_pull(skb, 5)))
+                goto drop;
+
         rcu_read_lock();
         proto = find_snap_client(skb_transport_header(skb));
         if (proto) {
@@ -62,14 +65,18 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
                 skb->transport_header += 5;
                 skb_pull_rcsum(skb, 5);
                 rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);
-        } else {
-                skb->sk = NULL;
-                kfree_skb(skb);
-                rc = 1;
         }
-
         rcu_read_unlock();
+
+        if (unlikely(!proto))
+                goto drop;
+
+out:
         return rc;
+
+drop:
+        kfree_skb(skb);
+        goto out;
 }
 
 /*
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 248d20f4c7c4..d29b88fe723c 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -298,7 +298,7 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
                 int rc;
 
                 ccid2_pr_debug("allocating more space in history\n");
-                rc = ccid2_hc_tx_alloc_seq(hctx, CCID2_SEQBUF_LEN, GFP_KERNEL);
+                rc = ccid2_hc_tx_alloc_seq(hctx, CCID2_SEQBUF_LEN, gfp_any());
                 BUG_ON(rc); /* XXX what do we do? */
 
                 next = hctx->ccid2hctx_seqh->ccid2s_next;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 50d86e94d9ed..5dead399fe64 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -794,7 +794,7 @@ slow_path:
                 /*
                  *      Copy a block of the IP datagram.
                  */
-                if (skb_copy_bits(skb, ptr, skb_transport_header(skb), len))
+                if (skb_copy_bits(skb, ptr, skb_transport_header(frag), len))
                         BUG();
                 left -= len;
 
diff --git a/net/irda/irmod.c b/net/irda/irmod.c
index 1900937b3328..8ba703da2797 100644
--- a/net/irda/irmod.c
+++ b/net/irda/irmod.c
@@ -128,8 +128,8 @@ static int __init irda_init(void)
  out_err_3:
 #ifdef CONFIG_SYSCTL
         irda_sysctl_unregister();
-#endif
  out_err_2:
+#endif
 #ifdef CONFIG_PROC_FS
         irda_proc_unregister();
 #endif
diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
index 694ea4d92fa8..1e429c929739 100644
--- a/net/irda/irnetlink.c
+++ b/net/irda/irnetlink.c
@@ -106,7 +106,7 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info)
         }
 
         if(nla_put_string(msg, IRDA_NL_ATTR_IFNAME,
-                          dev->name));
+                          dev->name))
                 goto err_out;
 
         if(nla_put_u32(msg, IRDA_NL_ATTR_MODE, irlap->mode))