---

yaml
---
r: 66915
b: refs/heads/master
c: 7d9e893
h: refs/heads/master
i:
  66913: 95087e9
  66911: f36fe6a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd1f7d347c9e51f348119811bd41b74346ec57b8
+refs/heads/master: 7d9e8931f93683e575679e41f188d3b465269f08

trunk/net/dccp/ccids/ccid2.c

@@ -294,12 +294,11 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
 	next = hctx->ccid2hctx_seqh->ccid2s_next;
 	/* check if we need to alloc more space */
 	if (next == hctx->ccid2hctx_seqt) {
-		int rc;
-
-		ccid2_pr_debug("allocating more space in history\n");
-		rc = ccid2_hc_tx_alloc_seq(hctx);
-		BUG_ON(rc); /* XXX what do we do? */
-
+		if (ccid2_hc_tx_alloc_seq(hctx)) {
+			DCCP_CRIT("packet history - out of memory!");
+			/* FIXME: find a more graceful way to bail out */
+			return;
+		}
 		next = hctx->ccid2hctx_seqh->ccid2s_next;
 		BUG_ON(next == hctx->ccid2hctx_seqt);
 	}