From ad87bcb7fc72f5149ebd2b89c4098615aa95ef5c Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Thu, 4 Oct 2007 14:41:26 -0700 Subject: [PATCH] --- yaml --- r: 66915 b: refs/heads/master c: 7d9e8931f93683e575679e41f188d3b465269f08 h: refs/heads/master i: 66913: 95087e9f98e3cbe45cd2c0e0bade87de6f7ef609 66911: f36fe6a343faac550c24000eb23a2a405d4b0383 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/ccid2.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c278ab14f46f..7859db4781de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd1f7d347c9e51f348119811bd41b74346ec57b8 +refs/heads/master: 7d9e8931f93683e575679e41f188d3b465269f08 diff --git a/trunk/net/dccp/ccids/ccid2.c b/trunk/net/dccp/ccids/ccid2.c index 5c6b4f97a664..3e4fa6b6f251 100644 --- a/trunk/net/dccp/ccids/ccid2.c +++ b/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); }