| Message ID | 20170930053434.4558-1-christophe.jaillet@wanadoo.fr |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: hns3: Fix an error handling path in 'hclge_rss_init_hw()' | expand |
Hi, Christophe On 2017/9/30 13:34, Christophe JAILLET wrote: > If this sanity check fails, we must free 'rss_indir'. Otherwise there is a > memory leak. > 'goto err' as done in the other error handling paths to fix it. Thanks for fixing. > > Fixes: 46a3df9f9718 ("net: hns3: Fix for setting rss_size incorrectly") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > index e0685e630afe..c1cdbfd83bdb 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > @@ -2652,7 +2652,8 @@ static int hclge_rss_init_hw(struct hclge_dev *hdev) > dev_err(&hdev->pdev->dev, > "Configure rss tc size failed, invalid TC_SIZE = %d\n", > rss_size); > - return -EINVAL; > + ret = -EINVAL; > + goto err; > } > > roundup_size = roundup_pow_of_two(rss_size); >
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Sat, 30 Sep 2017 07:34:34 +0200 > If this sanity check fails, we must free 'rss_indir'. Otherwise there is a > memory leak. > 'goto err' as done in the other error handling paths to fix it. > > Fixes: 46a3df9f9718 ("net: hns3: Fix for setting rss_size incorrectly") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Applied.
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index e0685e630afe..c1cdbfd83bdb 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -2652,7 +2652,8 @@ static int hclge_rss_init_hw(struct hclge_dev *hdev) dev_err(&hdev->pdev->dev, "Configure rss tc size failed, invalid TC_SIZE = %d\n", rss_size); - return -EINVAL; + ret = -EINVAL; + goto err; } roundup_size = roundup_pow_of_two(rss_size);
If this sanity check fails, we must free 'rss_indir'. Otherwise there is a memory leak. 'goto err' as done in the other error handling paths to fix it. Fixes: 46a3df9f9718 ("net: hns3: Fix for setting rss_size incorrectly") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)