2023-05-24 01:29:23

by Peilin Ye

Subject: [PATCH v5 net 1/6] net/sched: sch_ingress: Only create under TC_H_INGRESS

From: Peilin Ye <[email protected]>

ingress Qdiscs are only supposed to be created under TC_H_INGRESS.
Return -EOPNOTSUPP if 'parent' is not TC_H_INGRESS, similar to
mq_init().

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: [email protected]
Closes: https://lore.kernel.org/r/[email protected]/
Signed-off-by: Peilin Ye <[email protected]>
---
change in v5:
- avoid underflowing @ingress_needed_key in ->destroy(), reported by
Pedro

change in v3, v4:
- add in-body From: tag

net/sched/sch_ingress.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 84838128b9c5..f9ef6deb2770 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -80,6 +80,9 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
struct net_device *dev = qdisc_dev(sch);
int err;

+ if (sch->parent != TC_H_INGRESS)
+ return -EOPNOTSUPP;
+
net_inc_ingress_queue();

mini_qdisc_pair_init(&q->miniqp, sch, &dev->miniq_ingress);
@@ -101,6 +104,9 @@ static void ingress_destroy(struct Qdisc *sch)
{
struct ingress_sched_data *q = qdisc_priv(sch);

+ if (sch->parent != TC_H_INGRESS)
+ return;
+
tcf_block_put_ext(q->block, sch, &q->block_info);
net_dec_ingress_queue();
}
--
2.20.1

2023-05-24 16:22:21

by Jamal Hadi Salim

Subject: Re: [PATCH v5 net 1/6] net/sched: sch_ingress: Only create under TC_H_INGRESS

On Tue, May 23, 2023 at 9:18 PM Peilin Ye <[email protected]> wrote:
>
> From: Peilin Ye <[email protected]>
>
> ingress Qdiscs are only supposed to be created under TC_H_INGRESS.
> Return -EOPNOTSUPP if 'parent' is not TC_H_INGRESS, similar to
> mq_init().
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Reported-by: [email protected]
> Closes: https://lore.kernel.org/r/[email protected]/
> Signed-off-by: Peilin Ye <[email protected]>

Reviewed-by: Jamal Hadi Salim <[email protected]>
Acked-by: Jamal Hadi Salim <[email protected]>

cheers,
jamal
> ---
> change in v5:
> - avoid underflowing @ingress_needed_key in ->destroy(), reported by
> Pedro
>
> change in v3, v4:
> - add in-body From: tag
>
> net/sched/sch_ingress.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
> index 84838128b9c5..f9ef6deb2770 100644
> --- a/net/sched/sch_ingress.c
> +++ b/net/sched/sch_ingress.c
> @@ -80,6 +80,9 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
> struct net_device *dev = qdisc_dev(sch);
> int err;
>
> + if (sch->parent != TC_H_INGRESS)
> + return -EOPNOTSUPP;
> +
> net_inc_ingress_queue();
>
> mini_qdisc_pair_init(&q->miniqp, sch, &dev->miniq_ingress);
> @@ -101,6 +104,9 @@ static void ingress_destroy(struct Qdisc *sch)
> {
> struct ingress_sched_data *q = qdisc_priv(sch);
>
> + if (sch->parent != TC_H_INGRESS)
> + return;
> +
> tcf_block_put_ext(q->block, sch, &q->block_info);
> net_dec_ingress_queue();
> }
> --
> 2.20.1
>

2023-05-24 16:26:34

by Pedro Tammela

Subject: Re: [PATCH v5 net 1/6] net/sched: sch_ingress: Only create under TC_H_INGRESS

On 23/05/2023 22:17, Peilin Ye wrote:
> From: Peilin Ye <[email protected]>
>
> ingress Qdiscs are only supposed to be created under TC_H_INGRESS.
> Return -EOPNOTSUPP if 'parent' is not TC_H_INGRESS, similar to
> mq_init().
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Reported-by: [email protected]
> Closes: https://lore.kernel.org/r/[email protected]/
> Signed-off-by: Peilin Ye <[email protected]>

Tested-by: Pedro Tammela <[email protected]>

> ---
> change in v5:
> - avoid underflowing @ingress_needed_key in ->destroy(), reported by
> Pedro
>
> change in v3, v4:
> - add in-body From: tag
>
> net/sched/sch_ingress.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
> index 84838128b9c5..f9ef6deb2770 100644
> --- a/net/sched/sch_ingress.c
> +++ b/net/sched/sch_ingress.c
> @@ -80,6 +80,9 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
> struct net_device *dev = qdisc_dev(sch);
> int err;
>
> + if (sch->parent != TC_H_INGRESS)
> + return -EOPNOTSUPP;
> +
> net_inc_ingress_queue();
>
> mini_qdisc_pair_init(&q->miniqp, sch, &dev->miniq_ingress);
> @@ -101,6 +104,9 @@ static void ingress_destroy(struct Qdisc *sch)
> {
> struct ingress_sched_data *q = qdisc_priv(sch);
>
> + if (sch->parent != TC_H_INGRESS)
> + return;
> +
> tcf_block_put_ext(q->block, sch, &q->block_info);
> net_dec_ingress_queue();
> }