提交 7d2da603 编写于 作者: J Jakub Kicinski 提交者: David S. Miller

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: NJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 1bb665e3
...@@ -951,12 +951,14 @@ int nfp_cpp_read(struct nfp_cpp *cpp, u32 destination, ...@@ -951,12 +951,14 @@ int nfp_cpp_read(struct nfp_cpp *cpp, u32 destination,
return -ENOMEM; return -ENOMEM;
err = nfp_cpp_area_acquire(area); err = nfp_cpp_area_acquire(area);
if (err) if (err) {
goto out; nfp_cpp_area_free(area);
return err;
}
} }
err = nfp_cpp_area_read(area, offset, kernel_vaddr, length); err = nfp_cpp_area_read(area, offset, kernel_vaddr, length);
out:
if (cache) if (cache)
area_cache_put(cpp, cache); area_cache_put(cpp, cache);
else else
...@@ -993,13 +995,14 @@ int nfp_cpp_write(struct nfp_cpp *cpp, u32 destination, ...@@ -993,13 +995,14 @@ int nfp_cpp_write(struct nfp_cpp *cpp, u32 destination,
return -ENOMEM; return -ENOMEM;
err = nfp_cpp_area_acquire(area); err = nfp_cpp_area_acquire(area);
if (err) if (err) {
goto out; nfp_cpp_area_free(area);
return err;
}
} }
err = nfp_cpp_area_write(area, offset, kernel_vaddr, length); err = nfp_cpp_area_write(area, offset, kernel_vaddr, length);
out:
if (cache) if (cache)
area_cache_put(cpp, cache); area_cache_put(cpp, cache);
else else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册