netdev - Re: [Patch V4 net 01/11] net: hns3: add error handler for hns3_nic_init_vector

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: <a90e8a502366fef14d599dfbbaaeffa85cc77198.camel@perches.com>
Date:   Mon, 29 Oct 2018 10:44:47 -0700
From:   Joe Perches <joe@...ches.com>
To:     Huazhong Tan <tanhuazhong@...wei.com>, davem@...emloft.net,
        sergei.shtylyov@...entembedded.com
Cc:     netdev@...r.kernel.org, linuxarm@...wei.com,
        salil.mehta@...wei.com, yisen.zhuang@...wei.com,
        lipeng321@...wei.com, linyunsheng@...wei.com
Subject: Re: [Patch V4 net 01/11] net: hns3: add error handler for
 hns3_nic_init_vector_data()

On Mon, 2018-10-29 at 21:54 +0800, Huazhong Tan wrote:
> When hns3_nic_init_vector_data() fails to map ring to vector,
> it should cancel the netif_napi_add() that has been successfully
> done and then exits.
[]
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
[]
> @@ -2821,7 +2821,7 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv)
>  	struct hnae3_handle *h = priv->ae_handle;
>  	struct hns3_enet_tqp_vector *tqp_vector;
>  	int ret = 0;
> -	u16 i;
> +	int i, j;
>  
>  	hns3_nic_set_cpumask(priv);
>  
> @@ -2868,13 +2868,19 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv)
>  		hns3_free_vector_ring_chain(tqp_vector, &vector_ring_chain);
>  
>  		if (ret)
> -			return ret;
> +			goto map_ring_fail;
>  
>  		netif_napi_add(priv->netdev, &tqp_vector->napi,
>  			       hns3_nic_common_poll, NAPI_POLL_WEIGHT);
>  	}
>  
>  	return 0;
> +
> +map_ring_fail:
> +	for (j = i - 1; j >= 0; j--)
> +		netif_napi_del(&priv->tqp_vector[j].napi);

style trivia:

Error clearing is most commonly done without another variable
by decrementing i in the loop.