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 <mkube...@suse.cz>
> Reported-by: LiLiang <li...@redhat.com>
> Signed-off-by: Ivan Vecera <ivec...@redhat.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 <mkube...@suse.cz>
signature.asc
Description: PGP signature
