diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2016-07-11 16:54:20 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-11 13:52:00 -0700 |
| commit | f50cef6f77d08fced02eba7ac7c1cab4972c3786 (patch) | |
| tree | 24947099e752bc6645cf73a6e9ab09e2ee605726 /drivers/net/ethernet/netronome | |
| parent | net: smc91x: ACPI Enable lan91x adapters (diff) | |
| download | linux-dev-f50cef6f77d08fced02eba7ac7c1cab4972c3786.tar.xz linux-dev-f50cef6f77d08fced02eba7ac7c1cab4972c3786.zip | |
nfp: check idx is -ENOSPC before using it is an index
idx can be returned as -ENOSPC, so we should check for this first
before using it as an index into nn->vxlan_usecnt[] to avoid an
out of bounds array offset read.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 1e74b911accb..88678c172b19 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -2578,7 +2578,7 @@ static void nfp_net_del_vxlan_port(struct net_device *netdev, return; idx = nfp_net_find_vxlan_idx(nn, ti->port); - if (!nn->vxlan_usecnt[idx] || idx == -ENOSPC) + if (idx == -ENOSPC || !nn->vxlan_usecnt[idx]) return; if (!--nn->vxlan_usecnt[idx]) |