Commit fc944ecc authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paolo Abeni
Browse files

net: mctp: make key lookups match the ANY address on either local or peer 



We may have an ANY address in either the local or peer address of a
sk_key, and may want to match on an incoming daddr or saddr being ANY.

Do this by altering the conflicting-tag lookup to also accept ANY as
the local/peer address.

We don't want mctp_address_matches to match on the requested EID being
ANY, as that is a specific lookup case on packet input.

Reported-by: default avatarEric Chuang <echuang@google.com>
Reported-by: default avatarAnthony <anthonyhkf@google.com>
Signed-off-by: default avatarJeremy Kerr <jk@codeconstruct.com.au>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent aee6479a

net/mctp/route.c

+11 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static bool mctp_key_match(struct mctp_sk_key *key, mctp_eid_t local, 
	if (!mctp_address_matches(key->local_addr, local))

		return false;



	if (key->peer_addr != peer)

	if (!mctp_address_matches(key->peer_addr, peer))

		return false;



	if (key->tag != tag)
@@ -672,8 +672,16 @@ struct mctp_sk_key *mctp_alloc_local_tag(struct mctp_sock *msk, 
		if (tmp->tag & MCTP_HDR_FLAG_TO)

			continue;



		if (!(mctp_address_matches(tmp->peer_addr, peer) &&

		      mctp_address_matches(tmp->local_addr, local)))

		/* Since we're avoiding conflicting entries, match peer and

		 * local addresses, including with a wildcard on ANY. See

		 * 'A note on key allocations' for background.

		 */

		if (peer != MCTP_ADDR_ANY &&

		    !mctp_address_matches(tmp->peer_addr, peer))

			continue;



		if (local != MCTP_ADDR_ANY &&

		    !mctp_address_matches(tmp->local_addr, local))

			continue;



		spin_lock(&tmp->lock);