| Message ID | b88eba86-9488-4749-a896-7c7050132e7b@moroto.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 788f63c4dc1780c84deb5fe820f6446c28364a0d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: microchip: sparx5: clean up error checking in vcap_show_admin() | expand |
On Fri, Sep 08, 2023 at 10:03:37AM +0300, Dan Carpenter wrote: > The vcap_decode_rule() never returns NULL. There is no need to check > for that. This code assumes that if it did return NULL we should > end abruptly and return success. It is confusing. Fix the check to > just be if (IS_ERR()) instead of if (IS_ERR_OR_NULL()). > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/r/202309070831.hTvj9ekP-lkp@intel.com/ > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > This bug is old, but it doesn't affect runtime so it should go to > net-next. Reviewed-by: Simon Horman <horms@kernel.org>
> The vcap_decode_rule() never returns NULL. There is no need to check > for that. This code assumes that if it did return NULL we should > end abruptly and return success. It is confusing. Fix the check to > just be if (IS_ERR()) instead of if (IS_ERR_OR_NULL()). > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/r/202309070831.hTvj9ekP-lkp@intel.com/ > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > This bug is old, but it doesn't affect runtime so it should go to > net-next. > LGTM. Thanks Dan! Reviewed-by: Daniel Machon <daniel.machon@microchip.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 8 Sep 2023 10:03:37 +0300 you wrote: > The vcap_decode_rule() never returns NULL. There is no need to check > for that. This code assumes that if it did return NULL we should > end abruptly and return success. It is confusing. Fix the check to > just be if (IS_ERR()) instead of if (IS_ERR_OR_NULL()). > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/r/202309070831.hTvj9ekP-lkp@intel.com/ > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > [...] Here is the summary with links: - [net-next] net: microchip: sparx5: clean up error checking in vcap_show_admin() https://git.kernel.org/netdev/net-next/c/788f63c4dc17 You are awesome, thank you!
diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c b/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c index c2c3397c5898..59bfbda29bb3 100644 --- a/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c +++ b/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c @@ -300,7 +300,7 @@ static int vcap_show_admin(struct vcap_control *vctrl, vcap_show_admin_info(vctrl, admin, out); list_for_each_entry(elem, &admin->rules, list) { vrule = vcap_decode_rule(elem); - if (IS_ERR_OR_NULL(vrule)) { + if (IS_ERR(vrule)) { ret = PTR_ERR(vrule); break; }
The vcap_decode_rule() never returns NULL. There is no need to check for that. This code assumes that if it did return NULL we should end abruptly and return success. It is confusing. Fix the check to just be if (IS_ERR()) instead of if (IS_ERR_OR_NULL()). Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/r/202309070831.hTvj9ekP-lkp@intel.com/ Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- This bug is old, but it doesn't affect runtime so it should go to net-next. drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)