Commit 4ff40b86 authored Jan 22, 2019 by Xin Long Committed by David S. Miller Jan 24, 2019

sctp: set chunk transport correctly when it's a new asoc



In the paths:

  sctp_sf_do_unexpected_init() ->
    sctp_make_init_ack()
  sctp_sf_do_dupcook_a/b()() ->
    sctp_sf_do_5_1D_ce()

The new chunk 'retval' transport is set from the incoming chunk 'chunk'
transport. However, 'retval' transport belong to the new asoc, which
is a different one from 'chunk' transport's asoc.

It will cause that the 'retval' chunk gets set with a wrong transport.
Later when sending it and because of Commit b9fd6839 ("sctp: add
sctp_packet_singleton"), sctp_packet_singleton() will set some fields,
like vtag to 'retval' chunk from that wrong transport's asoc.

This patch is to fix it by setting 'retval' transport correctly which
belongs to the right asoc in sctp_make_init_ack() and
sctp_sf_do_5_1D_ce().

Fixes: b9fd6839 ("sctp: add sctp_packet_singleton")
Reported-by: Ying Xu <yinxu@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8220c870

net/sctp/sm_make_chunk.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -495,7 +495,10 @@ struct sctp_chunk sctp_make_init_ack(const struct sctp_association asoc,
		*
		* [INIT ACK back to where the INIT came from.]
		*/
		retval->transport = chunk->transport;
		if (chunk->transport)
		retval->transport =
		sctp_assoc_lookup_paddr(asoc,
		&chunk->transport->ipaddr);

		retval->subh.init_hdr =
		sctp_addto_chunk(retval, sizeof(initack), &initack);
		@@ -642,8 +645,10 @@ struct sctp_chunk sctp_make_cookie_ack(const struct sctp_association asoc,
		*
		* [COOKIE ACK back to where the COOKIE ECHO came from.]
		*/
		if (retval && chunk)
		retval->transport = chunk->transport;
		if (retval && chunk && chunk->transport)
		retval->transport =
		sctp_assoc_lookup_paddr(asoc,
		&chunk->transport->ipaddr);

		return retval;
		}

Admin message