net/xfrm: Use an IS_ERR test rather than a NULL test
Subsystems (4)
PATCH 1/1 net/xfrm: Use an IS_ERR test rather than a NULL test
From: Julien Brunel <[email protected]>
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>
--- net/xfrm/xfrm_policy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/xfrm/xfrm_policy.c +2 -4
@@ -1731,8 +1731,7 @@ restart:* We can't enlist stable bundles either. */ write_unlock_bh (&policy->lock); -if (dst) -dst_free (dst); +dst_free (dst);if (pol_dead)XFRM_INC_STATS (LINUX_MIB_XFRMOUTPOLDEAD );
@@ -1748,8 +1747,7 @@ restart: err =xfrm_dst_update_origin (dst, fl);if (unlikely (err)) {write_unlock_bh (&policy->lock); -if (dst) -dst_free (dst); +dst_free (dst);XFRM_INC_STATS (LINUX_MIB_XFRMOUTBUNDLECHECKERROR ); goto error; }
David Miller
maintainerFrom: Julien Brunel <[email protected]>
Date: Mon, 1 Sep 2008 10:53:33 +0200
Quoted 18 lines
In case of error, the function
xfrm_bundle_createreturns an ERR pointer, but never returns a NULL pointer. So a NULL test that comes after anIS_ERRtest 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>
Quoted 2 lines
Signed-off-by Julien Brunel <[email protected]>Signed-off-by Julia Lawall <[email protected]>
Looks good, patch applied, thanks.