Skip to content

L
linux-davinci
Commit 5447d477 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files
Options

[NETFILTER]: nf_conntrack_sctp: basic cleanups 

Reindent switch cases properly, get rid of weird constructs like "!(x == y)",
put logical operations on the end of the line instead of the next line, get
rid of superfluous braces.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d646286
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 68 deletions
net/netfilter/nf_conntrack_proto_sctp.c
View file @ 5447d477
...@@ -206,29 +206,27 @@ static int do_basic_checks(struct nf_conn *conntrack, ...@@ -206,29 +206,27 @@ static int do_basic_checks(struct nf_conn *conntrack,
for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) { for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
pr_debug("Chunk Num: %d Type: %d\n", count, sch->type); pr_debug("Chunk Num: %d Type: %d\n", count, sch->type);
if (sch->type == SCTP_CID_INIT if (sch->type == SCTP_CID_INIT ||
|| sch->type == SCTP_CID_INIT_ACK sch->type == SCTP_CID_INIT_ACK ||
|| sch->type == SCTP_CID_SHUTDOWN_COMPLETE) { sch->type == SCTP_CID_SHUTDOWN_COMPLETE)
flag = 1; flag = 1;
}
/* /*
* Cookie Ack/Echo chunks not the first OR * Cookie Ack/Echo chunks not the first OR
* Init / Init Ack / Shutdown compl chunks not the only chunks * Init / Init Ack / Shutdown compl chunks not the only chunks
* OR zero-length. * OR zero-length.
*/ */
if (((sch->type == SCTP_CID_COOKIE_ACK if (((sch->type == SCTP_CID_COOKIE_ACK ||
|| sch->type == SCTP_CID_COOKIE_ECHO sch->type == SCTP_CID_COOKIE_ECHO ||
|| flag) flag) &&
&& count !=0) || !sch->length) { count != 0) || !sch->length) {
pr_debug("Basic checks failed\n"); pr_debug("Basic checks failed\n");
return 1; return 1;
} }
if (map) { if (map)
set_bit(sch->type, (void *)map); set_bit(sch->type, (void *)map);
} }
}
pr_debug("Basic checks passed\n"); pr_debug("Basic checks passed\n");
return count == 0; return count == 0;
...@@ -245,31 +243,40 @@ static int new_state(enum ip_conntrack_dir dir, ...@@ -245,31 +243,40 @@ static int new_state(enum ip_conntrack_dir dir,
switch (chunk_type) { switch (chunk_type) {
case SCTP_CID_INIT: case SCTP_CID_INIT:
pr_debug("SCTP_CID_INIT\n"); pr_debug("SCTP_CID_INIT\n");
i = 0; break; i = 0;
break;
case SCTP_CID_INIT_ACK: case SCTP_CID_INIT_ACK:
pr_debug("SCTP_CID_INIT_ACK\n"); pr_debug("SCTP_CID_INIT_ACK\n");
i = 1; break; i = 1;
break;
case SCTP_CID_ABORT: case SCTP_CID_ABORT:
pr_debug("SCTP_CID_ABORT\n"); pr_debug("SCTP_CID_ABORT\n");
i = 2; break; i = 2;
break;
case SCTP_CID_SHUTDOWN: case SCTP_CID_SHUTDOWN:
pr_debug("SCTP_CID_SHUTDOWN\n"); pr_debug("SCTP_CID_SHUTDOWN\n");
i = 3; break; i = 3;
break;
case SCTP_CID_SHUTDOWN_ACK: case SCTP_CID_SHUTDOWN_ACK:
pr_debug("SCTP_CID_SHUTDOWN_ACK\n"); pr_debug("SCTP_CID_SHUTDOWN_ACK\n");
i = 4; break; i = 4;
break;
case SCTP_CID_ERROR: case SCTP_CID_ERROR:
pr_debug("SCTP_CID_ERROR\n"); pr_debug("SCTP_CID_ERROR\n");
i = 5; break; i = 5;
break;
case SCTP_CID_COOKIE_ECHO: case SCTP_CID_COOKIE_ECHO:
pr_debug("SCTP_CID_COOKIE_ECHO\n"); pr_debug("SCTP_CID_COOKIE_ECHO\n");
i = 6; break; i = 6;
break;
case SCTP_CID_COOKIE_ACK: case SCTP_CID_COOKIE_ACK:
pr_debug("SCTP_CID_COOKIE_ACK\n"); pr_debug("SCTP_CID_COOKIE_ACK\n");
i = 7; break; i = 7;
break;
case SCTP_CID_SHUTDOWN_COMPLETE: case SCTP_CID_SHUTDOWN_COMPLETE:
pr_debug("SCTP_CID_SHUTDOWN_COMPLETE\n"); pr_debug("SCTP_CID_SHUTDOWN_COMPLETE\n");
i = 8; break; i = 8;
break;
default: default:
/* Other chunks like DATA, SACK, HEARTBEAT and /* Other chunks like DATA, SACK, HEARTBEAT and
its ACK do not cause a change in state */ its ACK do not cause a change in state */
...@@ -307,12 +314,12 @@ static int sctp_packet(struct nf_conn *conntrack, ...@@ -307,12 +314,12 @@ static int sctp_packet(struct nf_conn *conntrack,
return -1; return -1;
/* Check the verification tag (Sec 8.5) */ /* Check the verification tag (Sec 8.5) */
if (!test_bit(SCTP_CID_INIT, (void *)map) if (!test_bit(SCTP_CID_INIT, (void *)map) &&
&& !test_bit(SCTP_CID_SHUTDOWN_COMPLETE, (void *)map) !test_bit(SCTP_CID_SHUTDOWN_COMPLETE, (void *)map) &&
&& !test_bit(SCTP_CID_COOKIE_ECHO, (void *)map) !test_bit(SCTP_CID_COOKIE_ECHO, (void *)map) &&
&& !test_bit(SCTP_CID_ABORT, (void *)map) !test_bit(SCTP_CID_ABORT, (void *)map) &&
&& !test_bit(SCTP_CID_SHUTDOWN_ACK, (void *)map) !test_bit(SCTP_CID_SHUTDOWN_ACK, (void *)map) &&
&& (sh->vtag != conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)])) { sh->vtag != conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
pr_debug("Verification tag check failed\n"); pr_debug("Verification tag check failed\n");
return -1; return -1;
} }
...@@ -330,24 +337,22 @@ static int sctp_packet(struct nf_conn *conntrack, ...@@ -330,24 +337,22 @@ static int sctp_packet(struct nf_conn *conntrack,
} }
} else if (sch->type == SCTP_CID_ABORT) { } else if (sch->type == SCTP_CID_ABORT) {
/* Sec 8.5.1 (B) */ /* Sec 8.5.1 (B) */
if (!(sh->vtag == conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)]) if (sh->vtag != conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)] &&
&& !(sh->vtag == conntrack->proto.sctp.vtag sh->vtag != conntrack->proto.sctp.vtag[1 - CTINFO2DIR(ctinfo)]) {
[1 - CTINFO2DIR(ctinfo)])) {
write_unlock_bh(&sctp_lock); write_unlock_bh(&sctp_lock);
return -1; return -1;
} }
} else if (sch->type == SCTP_CID_SHUTDOWN_COMPLETE) { } else if (sch->type == SCTP_CID_SHUTDOWN_COMPLETE) {
/* Sec 8.5.1 (C) */ /* Sec 8.5.1 (C) */
if (!(sh->vtag == conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)]) if (sh->vtag != conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)] &&
&& !(sh->vtag == conntrack->proto.sctp.vtag sh->vtag != conntrack->proto.sctp.vtag[1 - CTINFO2DIR(ctinfo)] &&
[1 - CTINFO2DIR(ctinfo)] (sch->flags & 1)) {
&& (sch->flags & 1))) {
write_unlock_bh(&sctp_lock); write_unlock_bh(&sctp_lock);
return -1; return -1;
} }
} else if (sch->type == SCTP_CID_COOKIE_ECHO) { } else if (sch->type == SCTP_CID_COOKIE_ECHO) {
/* Sec 8.5.1 (D) */ /* Sec 8.5.1 (D) */
if (!(sh->vtag == conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)])) { if (sh->vtag != conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
write_unlock_bh(&sctp_lock); write_unlock_bh(&sctp_lock);
return -1; return -1;
} }
...@@ -366,8 +371,8 @@ static int sctp_packet(struct nf_conn *conntrack, ...@@ -366,8 +371,8 @@ static int sctp_packet(struct nf_conn *conntrack,
} }
/* If it is an INIT or an INIT ACK note down the vtag */ /* If it is an INIT or an INIT ACK note down the vtag */
if (sch->type == SCTP_CID_INIT if (sch->type == SCTP_CID_INIT ||
|| sch->type == SCTP_CID_INIT_ACK) { sch->type == SCTP_CID_INIT_ACK) {
sctp_inithdr_t _inithdr, *ih; sctp_inithdr_t _inithdr, *ih;
ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t), ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t),
...@@ -389,9 +394,9 @@ static int sctp_packet(struct nf_conn *conntrack, ...@@ -389,9 +394,9 @@ static int sctp_packet(struct nf_conn *conntrack,
nf_ct_refresh_acct(conntrack, ctinfo, skb, *sctp_timeouts[newconntrack]); nf_ct_refresh_acct(conntrack, ctinfo, skb, *sctp_timeouts[newconntrack]);
if (oldsctpstate == SCTP_CONNTRACK_COOKIE_ECHOED if (oldsctpstate == SCTP_CONNTRACK_COOKIE_ECHOED &&
&& CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY &&
&& newconntrack == SCTP_CONNTRACK_ESTABLISHED) { newconntrack == SCTP_CONNTRACK_ESTABLISHED) {
pr_debug("Setting assured bit\n"); pr_debug("Setting assured bit\n");
set_bit(IPS_ASSURED_BIT, &conntrack->status); set_bit(IPS_ASSURED_BIT, &conntrack->status);
nf_conntrack_event_cache(IPCT_STATUS, skb); nf_conntrack_event_cache(IPCT_STATUS, skb);
...@@ -418,11 +423,10 @@ static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb, ...@@ -418,11 +423,10 @@ static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
return 0; return 0;
/* If an OOTB packet has any of these chunks discard (Sec 8.4) */ /* If an OOTB packet has any of these chunks discard (Sec 8.4) */
if ((test_bit (SCTP_CID_ABORT, (void *)map)) if (test_bit (SCTP_CID_ABORT, (void *)map) ||
|| (test_bit (SCTP_CID_SHUTDOWN_COMPLETE, (void *)map)) test_bit (SCTP_CID_SHUTDOWN_COMPLETE, (void *)map) ||
|| (test_bit (SCTP_CID_COOKIE_ACK, (void *)map))) { test_bit (SCTP_CID_COOKIE_ACK, (void *)map))
return 0; return 0;
}
newconntrack = SCTP_CONNTRACK_MAX; newconntrack = SCTP_CONNTRACK_MAX;
for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) { for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment