diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-03-21 17:59:16 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-03-22 12:59:08 -0700 |
| commit | 7d2da6038218ea08f3df74046f32bdff3589cf00 (patch) | |
| tree | 4b3fbfd96804dbb386fc589bc7a08842bcf4df3b /drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | |
| parent | nfp: fix invalid area detection (diff) | |
| download | linux-dev-7d2da6038218ea08f3df74046f32bdff3589cf00.tar.xz linux-dev-7d2da6038218ea08f3df74046f32bdff3589cf00.zip | |
nfp: fix nfp_cpp_read()/nfp_cpp_write() error paths
When acquiring an area fails we can't call function doing both
release and free.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c index 2e4796b52b84..e2abba4c3a3f 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c @@ -951,12 +951,14 @@ int nfp_cpp_read(struct nfp_cpp *cpp, u32 destination, return -ENOMEM; err = nfp_cpp_area_acquire(area); - if (err) - goto out; + if (err) { + nfp_cpp_area_free(area); + return err; + } } err = nfp_cpp_area_read(area, offset, kernel_vaddr, length); -out: + if (cache) area_cache_put(cpp, cache); else @@ -993,13 +995,14 @@ int nfp_cpp_write(struct nfp_cpp *cpp, u32 destination, return -ENOMEM; err = nfp_cpp_area_acquire(area); - if (err) - goto out; + if (err) { + nfp_cpp_area_free(area); + return err; + } } err = nfp_cpp_area_write(area, offset, kernel_vaddr, length); -out: if (cache) area_cache_put(cpp, cache); else |