From 4fc248650782f38a7590ffe437a258388da180bb Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Wed, 17 Dec 2008 16:08:01 -0800 Subject: [PATCH] --- yaml --- r: 122758 b: refs/heads/master c: a693722aec4ce26fb46c21cf4bf4422484a397a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/diag.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7cf2e0d4796c..d74258b858a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9732d523212060c44a4723332bdc5ee429eeabc3 +refs/heads/master: a693722aec4ce26fb46c21cf4bf4422484a397a7 diff --git a/trunk/net/dccp/diag.c b/trunk/net/dccp/diag.c index 652a1b67f727..b21f261da75e 100644 --- a/trunk/net/dccp/diag.c +++ b/trunk/net/dccp/diag.c @@ -32,8 +32,11 @@ static void dccp_get_info(struct sock *sk, struct tcp_info *info) if (dp->dccps_hc_rx_ackvec != NULL) info->tcpi_options |= TCPI_OPT_SACK; - ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info); - ccid_hc_tx_get_info(dp->dccps_hc_tx_ccid, sk, info); + if (dp->dccps_hc_rx_ccid != NULL) + ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info); + + if (dp->dccps_hc_tx_ccid != NULL) + ccid_hc_tx_get_info(dp->dccps_hc_tx_ccid, sk, info); } static void dccp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,