Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 35d63edb1c807bc5317e49592260e84637bc432e

Authored by Sridhar Samudrala
Committed by David S. Miller
1 parent 62b08083ec
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCTP]: Fix state table entries for chunks received in CLOSED state. 

Discard an unexpected chunk in CLOSED state rather can calling BUG().

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

net/sctp/sm_statetable.c
Diff comments   View file @ 35d63ed
... ... @@ -366,9 +366,9 @@
366 366 /* SCTP_STATE_EMPTY */ \
367 367 {.fn = sctp_sf_ootb, .name = "sctp_sf_ootb"}, \
368 368 /* SCTP_STATE_CLOSED */ \
369   - {.fn = sctp_sf_bug, .name = "sctp_sf_bug"}, \
  369 + {.fn = sctp_sf_discard_chunk, .name = "sctp_sf_discard_chunk"}, \
370 370 /* SCTP_STATE_COOKIE_WAIT */ \
371   - {.fn = sctp_sf_bug, .name = "sctp_sf_bug"}, \
  371 + {.fn = sctp_sf_discard_chunk, .name = "sctp_sf_discard_chunk"}, \
372 372 /* SCTP_STATE_COOKIE_ECHOED */ \
373 373 {.fn = sctp_sf_do_ecne, .name = "sctp_sf_do_ecne"}, \
374 374 /* SCTP_STATE_ESTABLISHED */ \
... ... @@ -380,7 +380,7 @@
380 380 /* SCTP_STATE_SHUTDOWN_RECEIVED */ \
381 381 {.fn = sctp_sf_do_ecne, .name = "sctp_sf_do_ecne"}, \
382 382 /* SCTP_STATE_SHUTDOWN_ACK_SENT */ \
383   - {.fn = sctp_sf_bug, .name = "sctp_sf_bug"}, \
  383 + {.fn = sctp_sf_discard_chunk, .name = "sctp_sf_discard_chunk"}, \
384 384 } /* TYPE_SCTP_ECN_ECNE */
385 385  
386 386 #define TYPE_SCTP_ECN_CWR { \
... ... @@ -401,7 +401,7 @@
401 401 /* SCTP_STATE_SHUTDOWN_RECEIVED */ \
402 402 {.fn = sctp_sf_discard_chunk, .name = "sctp_sf_discard_chunk"}, \
403 403 /* SCTP_STATE_SHUTDOWN_ACK_SENT */ \
404   - {.fn = sctp_sf_bug, .name = "sctp_sf_bug"}, \
  404 + {.fn = sctp_sf_discard_chunk, .name = "sctp_sf_discard_chunk"}, \
405 405 } /* TYPE_SCTP_ECN_CWR */
406 406  
407 407 #define TYPE_SCTP_SHUTDOWN_COMPLETE { \
... ... @@ -647,7 +647,7 @@
647 647 /* SCTP_STATE_EMPTY */ \
648 648 {.fn = sctp_sf_bug, .name = "sctp_sf_bug"}, \
649 649 /* SCTP_STATE_CLOSED */ \
650   - {.fn = sctp_sf_bug, .name = "sctp_sf_bug"}, \
  650 + {.fn = sctp_sf_error_closed, .name = "sctp_sf_error_closed"}, \
651 651 /* SCTP_STATE_COOKIE_WAIT */ \
652 652 {.fn = sctp_sf_do_prm_requestheartbeat, \
653 653 .name = "sctp_sf_do_prm_requestheartbeat"}, \