net: sched: fix act_ipt for LOG target (44ef548f) · Commits · 戴 / test

Before calling the destroy() or target() callbacks, the family parameter field has to be initialized. Otherwise at least the LOG target will refuse to work and upon removal oops the kernel. Cc: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by:

Phil Sutter <phil@nwl.cc> Acked-by:

Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/sched/act_ipt.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ static void ipt_destroy_target(struct xt_entry_target *t)
		struct xt_tgdtor_param par = {
		.target = t->u.kernel.target,
		.targinfo = t->data,
		.family = NFPROTO_IPV4,
		};
		if (par.target->destroy != NULL)
		par.target->destroy(&par);
		@@ -195,6 +196,7 @@ static int tcf_ipt(struct sk_buff skb, const struct tc_action a,
		par.hooknum = ipt->tcfi_hook;
		par.target = ipt->tcfi_t->u.kernel.target;
		par.targinfo = ipt->tcfi_t->data;
		par.family = NFPROTO_IPV4;
		ret = par.target->target(skb, &par);

		switch (ret) {

Admin message