projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.9-rc2-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
net
/
sctp
/
inqueue.c
diff --git
a/net/sctp/inqueue.c
b/net/sctp/inqueue.c
index
6437aa9
..
f731de3
100644
(file)
--- a/
net/sctp/inqueue.c
+++ b/
net/sctp/inqueue.c
@@
-213,7
+213,7
@@
new_skb:
}
chunk->chunk_hdr = ch;
}
chunk->chunk_hdr = ch;
- chunk->chunk_end = ((__u8 *)ch) +
WORD_ROUND
(ntohs(ch->length));
+ chunk->chunk_end = ((__u8 *)ch) +
SCTP_PAD4
(ntohs(ch->length));
skb_pull(chunk->skb, sizeof(sctp_chunkhdr_t));
chunk->subh.v = NULL; /* Subheader is no longer valid. */
skb_pull(chunk->skb, sizeof(sctp_chunkhdr_t));
chunk->subh.v = NULL; /* Subheader is no longer valid. */