| From foo@baz Sat 16 May 2020 02:04:40 PM CEST |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| Date: Fri, 8 May 2020 07:27:35 +0000 |
| Subject: nfp: abm: fix error return code in nfp_abm_vnic_alloc() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit 5099dea0a59f1c89525bb0ceac36689178a4c125 ] |
| |
| Fix to return negative error code -ENOMEM from the kzalloc() error |
| handling case instead of 0, as done elsewhere in this function. |
| |
| Fixes: 174ab544e3bc ("nfp: abm: add cls_u32 offload for simple band classification") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/netronome/nfp/abm/main.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/netronome/nfp/abm/main.c |
| +++ b/drivers/net/ethernet/netronome/nfp/abm/main.c |
| @@ -333,8 +333,10 @@ nfp_abm_vnic_alloc(struct nfp_app *app, |
| goto err_free_alink; |
| |
| alink->prio_map = kzalloc(abm->prio_map_len, GFP_KERNEL); |
| - if (!alink->prio_map) |
| + if (!alink->prio_map) { |
| + err = -ENOMEM; |
| goto err_free_alink; |
| + } |
| |
| /* This is a multi-host app, make sure MAC/PHY is up, but don't |
| * make the MAC/PHY state follow the state of any of the ports. |
