3 files changed, 12 insertions, 5 deletions

diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index ccbf72c793b6..c45088b5e6fb 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -40,6 +40,7 @@ static inline void ccids_write_unlock(void)
 static inline void ccids_read_lock(void)
 {
         atomic_inc(&ccids_lockct);
+        smp_mb__after_atomic_inc();
         spin_unlock_wait(&ccids_lock);
 }
 
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/dccp/feat.c b/net/dccp/feat.c
index cd845df5320d..5ebdd86c1b99 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -327,10 +327,16 @@ static void dccp_feat_empty_confirm(struct dccp_minisock *dmsk,
         }
 
         switch (type) {
-        case DCCPO_CHANGE_L: opt->dccpop_type = DCCPO_CONFIRM_R; break;
-        case DCCPO_CHANGE_R: opt->dccpop_type = DCCPO_CONFIRM_L; break;
-        default:             DCCP_WARN("invalid type %d\n", type); return;
-
+        case DCCPO_CHANGE_L:
+                opt->dccpop_type = DCCPO_CONFIRM_R;
+                break;
+        case DCCPO_CHANGE_R:
+                opt->dccpop_type = DCCPO_CONFIRM_L;
+                break;
+        default:
+                DCCP_WARN("invalid type %d\n", type);
+                kfree(opt);
+                return;
         }
         opt->dccpop_feat = feature;
         opt->dccpop_val  = NULL;