Commit 9d7d7402 authored by Julien Brunel's avatar Julien Brunel Committed by David S. Miller

net/xfrm: Use an IS_ERR test rather than a NULL test

In case of error, the function xfrm_bundle_create returns an ERR
pointer, but never returns a NULL pointer. So a NULL test that comes
after an IS_ERR test should be deleted.

The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@match_bad_null_test@
expression x, E;
statement S1,S2;
@@
x =  xfrm_bundle_create(...)
... when != x = E
*  if (x != NULL) 
S1 else S2
// </smpl>
Signed-off-by: default avatarJulien Brunel <brunel@diku.dk>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 773b4e02
...@@ -1731,7 +1731,6 @@ restart: ...@@ -1731,7 +1731,6 @@ restart:
* We can't enlist stable bundles either. * We can't enlist stable bundles either.
*/ */
write_unlock_bh(&policy->lock); write_unlock_bh(&policy->lock);
if (dst)
dst_free(dst); dst_free(dst);
if (pol_dead) if (pol_dead)
...@@ -1748,7 +1747,6 @@ restart: ...@@ -1748,7 +1747,6 @@ restart:
err = xfrm_dst_update_origin(dst, fl); err = xfrm_dst_update_origin(dst, fl);
if (unlikely(err)) { if (unlikely(err)) {
write_unlock_bh(&policy->lock); write_unlock_bh(&policy->lock);
if (dst)
dst_free(dst); dst_free(dst);
XFRM_INC_STATS(LINUX_MIB_XFRMOUTBUNDLECHECKERROR); XFRM_INC_STATS(LINUX_MIB_XFRMOUTBUNDLECHECKERROR);
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment