[PATCH] xfrm: fix the xfrm_policy/state_walk

[PATCH] xfrm: fix the xfrm_policy/state_walk

[roy.qing.li]

From: Li RongQing <roy.qing.li@gmail.com>

If the walk from input is not empty, the following loop should start from
the walk->next, since walk is list header, and the last policy in previours
loop is connected walk tailor by list_move_tail()

Fixes: 12a169e7d8f(ipsec: Put dumpers on the dump list)
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/xfrm/xfrm_policy.c | 2 +-
 net/xfrm/xfrm_state.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index d8c35ad..7a63148 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1004,7 +1004,7 @@ int xfrm_policy_walk(struct net *net, struct xfrm_policy_walk *walk,
 	if (list_empty(&walk->walk.all))
 		x = list_first_entry(&net->xfrm.policy_all, struct xfrm_policy_walk_entry, all);
 	else
-		x = list_entry(&walk->walk.all, struct xfrm_policy_walk_entry, all);
+		x = list_first_entry(&walk->walk.all, struct xfrm_policy_walk_entry, all);
 	list_for_each_entry_from(x, &net->xfrm.policy_all, all) {
 		if (x->dead)
 			continue;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f5e39e3..df93183 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1626,7 +1626,7 @@ int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
 	if (list_empty(&walk->all))
 		x = list_first_entry(&net->xfrm.state_all, struct xfrm_state_walk, all);
 	else
-		x = list_entry(&walk->all, struct xfrm_state_walk, all);
+		x = list_first_entry(&walk->all, struct xfrm_state_walk, all);
 	list_for_each_entry_from(x, &net->xfrm.state_all, all) {
 		if (x->state == XFRM_STATE_DEAD)
 			continue;
-- 
2.1.0

Re: [PATCH] xfrm: fix the xfrm_policy/state_walk

[Herbert Xu]

On Wed, Apr 22, 2015 at 03:53:34PM +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
> 
> If the walk from input is not empty, the following loop should start from
> the walk->next, since walk is list header, and the last policy in previours
> loop is connected walk tailor by list_move_tail()
> 
> Fixes: 12a169e7d8f(ipsec: Put dumpers on the dump list)
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>

This is not a bug fix but an optimisation.  The walker entries are
all marked as dead and will be skipped by the loop.

However, I don't see anything wrong with this optimisation.

Cheers,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH] xfrm: fix the xfrm_policy/state_walk

[Li RongQing]

On Wed, Apr 22, 2015 at 3:57 PM, Herbert Xu <herbert@gondor.apana.org.au> wrote:
>> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
>
> This is not a bug fix but an optimisation.  The walker entries are
> all marked as dead and will be skipped by the loop.
>
> However, I don't see anything wrong with this optimisation.
>
> Cheers,


thanks, you are right, I will rewrite the commit header

-Roy