netdev - Re: [PATCH net] ethtool: fix error paths in ethnl_set

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201215100921.3qnmqdbhxpniejnw@lion.mk-sys.cz>
Date:   Tue, 15 Dec 2020 11:09:21 +0100
From:   Michal Kubecek <mkubecek@...e.cz>
To:     Ivan Vecera <ivecera@...hat.com>
Cc:     netdev@...r.kernel.org, LiLiang <liali@...hat.com>
Subject: Re: [PATCH net] ethtool: fix error paths in ethnl_set_channels()

On Tue, Dec 15, 2020 at 10:08:10AM +0100, Ivan Vecera wrote:
> Fix two error paths in ethnl_set_channels() to avoid lock-up caused
> but unreleased RTNL.
> 
> Fixes: e19c591eafad ("ethtool: set device channel counts with CHANNELS_SET request")
> Cc: Michal Kubecek <mkubecek@...e.cz>
> Reported-by: LiLiang <liali@...hat.com>
> Signed-off-by: Ivan Vecera <ivecera@...hat.com>
> ---
>  net/ethtool/channels.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/net/ethtool/channels.c b/net/ethtool/channels.c
> index 5635604cb9ba..25a9e566ef5c 100644
> --- a/net/ethtool/channels.c
> +++ b/net/ethtool/channels.c
> @@ -194,8 +194,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
>  	if (netif_is_rxfh_configured(dev) &&
>  	    !ethtool_get_max_rxfh_channel(dev, &max_rx_in_use) &&
>  	    (channels.combined_count + channels.rx_count) <= max_rx_in_use) {
> +		ret = -EINVAL;
>  		GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing indirection table settings");
> -		return -EINVAL;
> +		goto out_ops;
>  	}
>  
>  	/* Disabling channels, query zero-copy AF_XDP sockets */
> @@ -203,8 +204,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
>  		       min(channels.rx_count, channels.tx_count);
>  	for (i = from_channel; i < old_total; i++)
>  		if (xsk_get_pool_from_qid(dev, i)) {
> +			ret = -EINVAL;
>  			GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing zerocopy AF_XDP sockets");
> -			return -EINVAL;
> +			goto out_ops;
>  		}
>  
>  	ret = dev->ethtool_ops->set_channels(dev, &channels);

Oh, the joys of mindless copy and paste... :-(

Reviewed-by: Michal Kubecek <mkubecek@...e.cz>

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)