aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-03-20 22:24:41 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-20 22:24:41 -0500
commit04e2661e9c00386412b64612549cf24c8baef67c (patch)
treed2c53123806041dfe4c0dc2b18a890a1f5333105 /net
parent057fc6755a2381b4e81636659ef519e069f38623 (diff)
[DCCP]: Call dccp_feat_init more early in dccp_v4_init_sock
So that dccp_feat_clean doesn't get confused with uninitialized list_heads. Noticed when testing with no ccid kernel modules. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/ipv4.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index be5ce57b8046..f94286e46c42 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1051,7 +1051,10 @@ int dccp_v4_init_sock(struct sock *sk)
1051 * setsockopt(CCIDs-I-want/accept). -acme 1051 * setsockopt(CCIDs-I-want/accept). -acme
1052 */ 1052 */
1053 if (likely(!dccp_ctl_socket_init)) { 1053 if (likely(!dccp_ctl_socket_init)) {
1054 int rc; 1054 int rc = dccp_feat_init(sk);
1055
1056 if (rc)
1057 return rc;
1055 1058
1056 if (dp->dccps_options.dccpo_send_ack_vector) { 1059 if (dp->dccps_options.dccpo_send_ack_vector) {
1057 dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL); 1060 dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
@@ -1075,10 +1078,6 @@ int dccp_v4_init_sock(struct sock *sk)
1075 dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL; 1078 dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;
1076 return -ENOMEM; 1079 return -ENOMEM;
1077 } 1080 }
1078
1079 rc = dccp_feat_init(sk);
1080 if (rc)
1081 return rc;
1082 } else { 1081 } else {
1083 /* control socket doesn't need feat nego */ 1082 /* control socket doesn't need feat nego */
1084 INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending); 1083 INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending);