Re: [PATCH net-next v3 6/8] net: mctp: Allow limiting binds to a peer address

[Simon Horman <horms@kernel.org>]

On Wed, Jul 09, 2025 at 04:31:07PM +0800, Matt Johnston wrote:

...

> @@ -87,13 +87,33 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
>  	 * lookup time.
>  	 */
>  	if (smctp->smctp_network == MCTP_NET_ANY &&
> -	    msk->bind_addr != MCTP_ADDR_ANY) {
> +	    msk->bind_local_addr != MCTP_ADDR_ANY) {
>  		msk->bind_net = mctp_default_net(net);
>  	} else {
>  		msk->bind_net = smctp->smctp_network;
>  	}
>  
> -	msk->bind_type = smctp->smctp_type & 0x7f; /* ignore the IC bit */
> +	/* ignore the IC bit */
> +	smctp->smctp_type &= 0x7f;
> +
> +	if (msk->bind_peer_set) {
> +		if (msk->bind_type != smctp->smctp_type) {
> +			/* Prior connect() had a different type */
> +			return -EINVAL;

Hi Matt,

I think you need to set rc and goto out_release here so
that sk is released.

> +		}
> +
> +		if (msk->bind_net == MCTP_NET_ANY) {
> +			/* Restrict to the network passed to connect() */
> +			msk->bind_net = msk->bind_peer_net;
> +		}
> +
> +		if (msk->bind_net != msk->bind_peer_net) {
> +			/* connect() had a different net to bind() */
> +			return -EINVAL;

Ditto.

Flagged by Smatch.

> +		}
> +	} else {
> +		msk->bind_type = smctp->smctp_type;
> +	}
>  
>  	rc = sk->sk_prot->hash(sk);
>  

...

-- 
pw-bot: changes-requested