* [PATCH net-next] ice: Fix error return code in ice_init_hw()
@ 2018-03-28 12:50 Wei Yongjun
2018-03-29 16:31 ` [Intel-wired-lan] " Venkataramanan, Anirudh
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2018-03-28 12:50 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: Wei Yongjun, intel-wired-lan, netdev, kernel-janitors
Fix to return error code ICE_ERR_NO_MEMORY from the alloc error
handling case instead of 0, as done elsewhere in this function.
Fixes: dc49c7723676 ("ice: Get MAC/PHY/link info and scheduler topology")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei•com>
---
drivers/net/ethernet/intel/ice/ice_common.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 385f5d4..21977ec 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -468,8 +468,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
mac_buf_len = sizeof(struct ice_aqc_manage_mac_read_resp);
mac_buf = devm_kzalloc(ice_hw_to_dev(hw), mac_buf_len, GFP_KERNEL);
- if (!mac_buf)
+ if (!mac_buf) {
+ status = ICE_ERR_NO_MEMORY;
goto err_unroll_fltr_mgmt_struct;
+ }
status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len, NULL);
devm_kfree(ice_hw_to_dev(hw), mac_buf);
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Intel-wired-lan] [PATCH net-next] ice: Fix error return code in ice_init_hw()
2018-03-28 12:50 [PATCH net-next] ice: Fix error return code in ice_init_hw() Wei Yongjun
@ 2018-03-29 16:31 ` Venkataramanan, Anirudh
0 siblings, 0 replies; 2+ messages in thread
From: Venkataramanan, Anirudh @ 2018-03-29 16:31 UTC (permalink / raw)
To: Kirsher, Jeffrey T, weiyongjun1@huawei•com
Cc: netdev@vger•kernel.org, intel-wired-lan@lists•osuosl.org,
kernel-janitors@vger•kernel.org
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
On Wed, 2018-03-28 at 12:50 +0000, Wei Yongjun wrote:
> Fix to return error code ICE_ERR_NO_MEMORY from the alloc error
> handling case instead of 0, as done elsewhere in this function.
>
> Fixes: dc49c7723676 ("ice: Get MAC/PHY/link info and scheduler
> topology")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei•com>
> ---
> drivers/net/ethernet/intel/ice/ice_common.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c
> b/drivers/net/ethernet/intel/ice/ice_common.c
> index 385f5d4..21977ec 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -468,8 +468,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
> mac_buf_len = sizeof(struct ice_aqc_manage_mac_read_resp);
> mac_buf = devm_kzalloc(ice_hw_to_dev(hw), mac_buf_len,
> GFP_KERNEL);
>
> - if (!mac_buf)
> + if (!mac_buf) {
> + status = ICE_ERR_NO_MEMORY;
> goto err_unroll_fltr_mgmt_struct;
> + }
>
> status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len,
> NULL);
> devm_kfree(ice_hw_to_dev(hw), mac_buf);
>
Acked-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel•com>
Thanks!
Ani
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3302 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-29 16:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-28 12:50 [PATCH net-next] ice: Fix error return code in ice_init_hw() Wei Yongjun
2018-03-29 16:31 ` [Intel-wired-lan] " Venkataramanan, Anirudh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox