diff options
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_dccp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c index 38412684a882..cb372f96f10d 100644 --- a/net/netfilter/nf_conntrack_proto_dccp.c +++ b/net/netfilter/nf_conntrack_proto_dccp.c | |||
| @@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb, | |||
| 428 | const char *msg; | 428 | const char *msg; |
| 429 | u_int8_t state; | 429 | u_int8_t state; |
| 430 | 430 | ||
| 431 | dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh); | 431 | dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh); |
| 432 | BUG_ON(dh == NULL); | 432 | BUG_ON(dh == NULL); |
| 433 | 433 | ||
| 434 | state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE]; | 434 | state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE]; |
| @@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb, | |||
| 486 | u_int8_t type, old_state, new_state; | 486 | u_int8_t type, old_state, new_state; |
| 487 | enum ct_dccp_roles role; | 487 | enum ct_dccp_roles role; |
| 488 | 488 | ||
| 489 | dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh); | 489 | dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh); |
| 490 | BUG_ON(dh == NULL); | 490 | BUG_ON(dh == NULL); |
| 491 | type = dh->dccph_type; | 491 | type = dh->dccph_type; |
| 492 | 492 | ||
| @@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl, | |||
| 577 | unsigned int cscov; | 577 | unsigned int cscov; |
| 578 | const char *msg; | 578 | const char *msg; |
| 579 | 579 | ||
| 580 | dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh); | 580 | dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh); |
| 581 | if (dh == NULL) { | 581 | if (dh == NULL) { |
| 582 | msg = "nf_ct_dccp: short packet "; | 582 | msg = "nf_ct_dccp: short packet "; |
| 583 | goto out_invalid; | 583 | goto out_invalid; |
