Skip to content

Commit d84a69a

Browse files
Etsukatagregkh
authored andcommitted
sctp: account stream padding length for reconf chunk
commit a2d859e upstream. sctp_make_strreset_req() makes repeated calls to sctp_addto_chunk() which will automatically account for padding on each call. inreq and outreq are already 4 bytes aligned, but the payload is not and doing SCTP_PAD4(a + b) (which _sctp_make_chunk() did implicitly here) is different from SCTP_PAD4(a) + SCTP_PAD4(b) and not enough. It led to possible attempt to use more buffer than it was allocated and triggered a BUG_ON. Cc: Vlad Yasevich <[email protected]> Cc: Neil Horman <[email protected]> Cc: Greg KH <[email protected]> Fixes: cc16f00 ("sctp: add support for generating stream reconf ssn reset request chunk") Reported-by: Eiichi Tsukata <[email protected]> Signed-off-by: Eiichi Tsukata <[email protected]> Signed-off-by: Marcelo Ricardo Leitner <[email protected]> Signed-off-by: Marcelo Ricardo Leitner <[email protected]> Reviewed-by: Xin Long <[email protected]> Link: https://lore.kernel.org/r/b97c1f8b0c7ff79ac4ed206fc2c49d3612e0850c.1634156849.git.mleitner@redhat.com Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6fecdb5 commit d84a69a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/sctp/sm_make_chunk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3651,7 +3651,7 @@ struct sctp_chunk *sctp_make_strreset_req(
36513651
outlen = (sizeof(outreq) + stream_len) * out;
36523652
inlen = (sizeof(inreq) + stream_len) * in;
36533653

3654-
retval = sctp_make_reconf(asoc, outlen + inlen);
3654+
retval = sctp_make_reconf(asoc, SCTP_PAD4(outlen) + SCTP_PAD4(inlen));
36553655
if (!retval)
36563656
return NULL;
36573657

0 commit comments

Comments
 (0)