Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcd76081 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net_sched: fix a regression in tcf_proto_lookup_ops() 



list_for_each_entry(t, &tcf_proto_base, head) doesn't
exit with t = NULL if we reached the end of the list.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Fixes: 36272874 ("net_sched: convert tcf_proto_ops to use struct
list_head")
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 568a153a

net/sched/cls_api.c

+10 −12
Original line number Diff line number Diff line
@@ -40,20 +40,20 @@ static DEFINE_RWLOCK(cls_mod_lock); 


static const struct tcf_proto_ops *tcf_proto_lookup_ops(struct nlattr *kind)

{

	const struct tcf_proto_ops *t = NULL;

	const struct tcf_proto_ops *t, *res = NULL;



	if (kind) {

		read_lock(&cls_mod_lock);

		list_for_each_entry(t, &tcf_proto_base, head) {

			if (nla_strcmp(kind, t->kind) == 0) {

				if (!try_module_get(t->owner))

					t = NULL;

				if (try_module_get(t->owner))

					res = t;

				break;

			}

		}

		read_unlock(&cls_mod_lock);

	}

	return t;

	return res;

}



/* Register(unregister) new classifier type */
@@ -82,15 +82,13 @@ int unregister_tcf_proto_ops(struct tcf_proto_ops *ops) 
	int rc = -ENOENT;



	write_lock(&cls_mod_lock);

	list_for_each_entry(t, &tcf_proto_base, head)

		if (t == ops)

			break;



	if (!t)

		goto out;

	list_for_each_entry(t, &tcf_proto_base, head) {

		if (t == ops) {

			list_del(&t->head);

			rc = 0;

out:

			break;

		}

	}

	write_unlock(&cls_mod_lock);

	return rc;

}