diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:19:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:19:26 -0500 |
| commit | 18a4144028f056b77d6576d4eb284246e9c7ea97 (patch) | |
| tree | 85277bf6b49982753d762d58a14aa642e79c037e /net/sctp/sm_statefuns.c | |
| parent | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (diff) | |
| parent | 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/sm_statefuns.c')
| -rw-r--r-- | net/sctp/sm_statefuns.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 477d7f80dba6..71c9a961c321 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -3090,6 +3090,8 @@ sctp_disposition_t sctp_sf_ootb(const struct sctp_endpoint *ep, | |||
| 3090 | break; | 3090 | break; |
| 3091 | 3091 | ||
| 3092 | ch_end = ((__u8 *)ch) + WORD_ROUND(ntohs(ch->length)); | 3092 | ch_end = ((__u8 *)ch) + WORD_ROUND(ntohs(ch->length)); |
| 3093 | if (ch_end > skb->tail) | ||
| 3094 | break; | ||
| 3093 | 3095 | ||
| 3094 | if (SCTP_CID_SHUTDOWN_ACK == ch->type) | 3096 | if (SCTP_CID_SHUTDOWN_ACK == ch->type) |
| 3095 | ootb_shut_ack = 1; | 3097 | ootb_shut_ack = 1; |