netdev - Re: [patch net-next] net: sched: cls_api: make reclassify return all the way back to the original tp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 23 May 2017 13:50:39 +0200
From:   Simon Horman <simon.horman@...ronome.com>
To:     Jiri Pirko <jiri@...nulli.us>
Cc:     netdev@...r.kernel.org, davem@...emloft.net, jhs@...atatu.com,
        xiyou.wangcong@...il.com, dsa@...ulusnetworks.com,
        edumazet@...gle.com, daniel@...earbox.net,
        alexander.h.duyck@...el.com, mlxsw@...lanox.com
Subject: Re: [patch net-next] net: sched: cls_api: make reclassify return all
 the way back to the original tp

On Tue, May 23, 2017 at 09:11:59AM +0200, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@...lanox.com>
> 
> With the introduction of chain goto action, the reclassification would
> cause the re-iteration of the actual chain. It makes more sense to restart
> the whole thing and re-iterate starting from the original tp - start
> of chain 0.
> 
> Signed-off-by: Jiri Pirko <jiri@...lanox.com>

Reviewed-by: Simon Horman <simon.horman@...ronome.com>

> ---
>  net/sched/cls_api.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
> index 01a8b8b..89fbb35 100644
> --- a/net/sched/cls_api.c
> +++ b/net/sched/cls_api.c
> @@ -300,7 +300,8 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
>  	__be16 protocol = tc_skb_protocol(skb);
>  #ifdef CONFIG_NET_CLS_ACT
>  	const int max_reclassify_loop = 4;
> -	const struct tcf_proto *old_tp = tp;
> +	const struct tcf_proto *orig_tp = tp;
> +	const struct tcf_proto *first_tp;
>  	int limit = 0;
>  
>  reclassify:
> @@ -315,9 +316,10 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
>  		err = tp->classify(skb, tp, res);
>  #ifdef CONFIG_NET_CLS_ACT
>  		if (unlikely(err == TC_ACT_RECLASSIFY && !compat_mode)) {
> +			first_tp = orig_tp;
>  			goto reset;
>  		} else if (unlikely(TC_ACT_EXT_CMP(err, TC_ACT_GOTO_CHAIN))) {
> -			old_tp = res->goto_tp;
> +			first_tp = res->goto_tp;
>  			goto reset;
>  		}
>  #endif
> @@ -335,7 +337,7 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
>  		return TC_ACT_SHOT;
>  	}
>  
> -	tp = old_tp;
> +	tp = first_tp;
>  	protocol = tc_skb_protocol(skb);
>  	goto reclassify;
>  #endif
> -- 
> 2.9.3
>