[PKT_SCHED]: Fix error handling while dumping actions

"return -err" and blindly inheriting the error code in the netlink
failure exception handler causes errors codes to be returned as
positive value therefore making them being ignored by the caller.

May lead to sending out incomplete netlink messages.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Graf 2006-07-05 20:47:28 -07:00 committed by David S. Miller
parent d152b4e1e9
commit 4fe683f50d

View file

@ -250,15 +250,17 @@ tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref)
RTA_PUT(skb, a->order, 0, NULL); RTA_PUT(skb, a->order, 0, NULL);
err = tcf_action_dump_1(skb, a, bind, ref); err = tcf_action_dump_1(skb, a, bind, ref);
if (err < 0) if (err < 0)
goto rtattr_failure; goto errout;
r->rta_len = skb->tail - (u8*)r; r->rta_len = skb->tail - (u8*)r;
} }
return 0; return 0;
rtattr_failure: rtattr_failure:
err = -EINVAL;
errout:
skb_trim(skb, b - skb->data); skb_trim(skb, b - skb->data);
return -err; return err;
} }
struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est, struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est,