Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dd050f8 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

rxrpc: Don't assume transport address family and size when using it 



Don't assume transport address family and size when using the peer address
to send a packet.  Instead, use the start of the transport address rather
than any particular element of the union and use the transport address
length noted inside the sockaddr_rxrpc struct.

This will be necessary when IPv6 support is introduced.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 843099ca

net/rxrpc/ar-ack.c

+2 −2
Original line number Diff line number Diff line
@@ -833,8 +833,8 @@ void rxrpc_process_call(struct work_struct *work) 


	/* there's a good chance we're going to have to send a message, so set

	 * one up in advance */

	msg.msg_name	= &call->conn->trans->peer->srx.transport.sin;

	msg.msg_namelen	= sizeof(call->conn->trans->peer->srx.transport.sin);

	msg.msg_name	= &call->conn->trans->peer->srx.transport;

	msg.msg_namelen	= call->conn->trans->peer->srx.transport_len;

	msg.msg_control	= NULL;

	msg.msg_controllen = 0;

	msg.msg_flags	= 0;

net/rxrpc/ar-connevent.c

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn, 


	rxrpc_abort_calls(conn, RXRPC_CALL_LOCALLY_ABORTED, abort_code);



	msg.msg_name	= &conn->trans->peer->srx.transport.sin;

	msg.msg_namelen	= sizeof(conn->trans->peer->srx.transport.sin);

	msg.msg_name	= &conn->trans->peer->srx.transport;

	msg.msg_namelen	= conn->trans->peer->srx.transport_len;

	msg.msg_control	= NULL;

	msg.msg_controllen = 0;

	msg.msg_flags	= 0;