| Message ID | 7f7aeb91-8771-47b8-9275-9d9f64f947dd@stanley.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 75834577c0870c9087274f015887b6f4106b3a24 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] ice: Fix a couple NULL vs IS_ERR() bugs | expand |
On Sat, Sep 14, 2024 at 12:57:28PM +0300, Dan Carpenter wrote: > The ice_repr_create() function returns error pointers. It never returns > NULL. Fix the callers to check for IS_ERR(). > > Fixes: 977514fb0fa8 ("ice: create port representor for SF") > Fixes: 415db8399d06 ("ice: make representor code generic") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sat, 14 Sep 2024 12:57:28 +0300 you wrote: > The ice_repr_create() function returns error pointers. It never returns > NULL. Fix the callers to check for IS_ERR(). > > Fixes: 977514fb0fa8 ("ice: create port representor for SF") > Fixes: 415db8399d06 ("ice: make representor code generic") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > [...] Here is the summary with links: - [net-next] ice: Fix a couple NULL vs IS_ERR() bugs https://git.kernel.org/netdev/net-next/c/75834577c087 You are awesome, thank you!
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c index 00d4a9125dfa..970a99a52bf1 100644 --- a/drivers/net/ethernet/intel/ice/ice_repr.c +++ b/drivers/net/ethernet/intel/ice/ice_repr.c @@ -452,8 +452,8 @@ struct ice_repr *ice_repr_create_vf(struct ice_vf *vf) return ERR_PTR(-EINVAL); repr = ice_repr_create(vsi); - if (!repr) - return ERR_PTR(-ENOMEM); + if (IS_ERR(repr)) + return repr; repr->type = ICE_REPR_TYPE_VF; repr->vf = vf; @@ -501,8 +501,8 @@ struct ice_repr *ice_repr_create_sf(struct ice_dynamic_port *sf) { struct ice_repr *repr = ice_repr_create(sf->vsi); - if (!repr) - return ERR_PTR(-ENOMEM); + if (IS_ERR(repr)) + return repr; repr->type = ICE_REPR_TYPE_SF; repr->sf = sf;
The ice_repr_create() function returns error pointers. It never returns NULL. Fix the callers to check for IS_ERR(). Fixes: 977514fb0fa8 ("ice: create port representor for SF") Fixes: 415db8399d06 ("ice: make representor code generic") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/net/ethernet/intel/ice/ice_repr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)