2017-04-06 12:54:47

by Colin King

Subject: [PATCH][-next] nfp: don't dereference a null nn->eth_port to print a warning

From: Colin Ian King <[email protected]>

On the case where nn->eth_port is null the warning message
is printing the port by dereferencing this null pointer.
Remove the deference to avoid a crash when printing the
warning message.

Detected by CoverityScan, CID#1426198 ("Dereference after null check")

Fixes: ce22f5a2cbe3c627 ("nfp: separate high level and low level NSP headers")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 3e1f97e88710..4c6863a072d3 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -495,8 +495,7 @@ static void nfp_net_refresh_netdevs(struct work_struct *work)

list_for_each_entry_safe(nn, next, &pf->ports, port_list) {
if (!nn->eth_port) {
- nfp_warn(pf->cpp, "Warning: port %d not present after reconfig\n",
- nn->eth_port->eth_index);
+ nfp_warn(pf->cpp, "Warning: port not present after reconfig\n");
continue;
}
if (!nn->eth_port->override_changed)
--
2.11.0

2017-04-06 23:15:39

by Jakub Kicinski

Subject: Re: [PATCH][-next] nfp: don't dereference a null nn->eth_port to print a warning

On Thu, 6 Apr 2017 13:54:35 +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> On the case where nn->eth_port is null the warning message
> is printing the port by dereferencing this null pointer.
> Remove the deference to avoid a crash when printing the
> warning message.
>
> Detected by CoverityScan, CID#1426198 ("Dereference after null check")
>
> Fixes: ce22f5a2cbe3c627 ("nfp: separate high level and low level NSP headers")
> Signed-off-by: Colin Ian King <[email protected]>

Acked-by: Jakub Kicinski <[email protected]>

Thanks!

2017-04-08 15:15:08

by David Miller

Subject: Re: [PATCH][-next] nfp: don't dereference a null nn->eth_port to print a warning

From: Colin King <[email protected]>
Date: Thu, 6 Apr 2017 13:54:35 +0100

> From: Colin Ian King <[email protected]>
>
> On the case where nn->eth_port is null the warning message
> is printing the port by dereferencing this null pointer.
> Remove the deference to avoid a crash when printing the
> warning message.
>
> Detected by CoverityScan, CID#1426198 ("Dereference after null check")
>
> Fixes: ce22f5a2cbe3c627 ("nfp: separate high level and low level NSP headers")
> Signed-off-by: Colin Ian King <[email protected]>

Applied, thanks.