diff options
| author | Thomas Graf <tgraf@suug.ch> | 2006-07-05 20:47:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-05 20:47:28 -0700 |
| commit | 4fe683f50d3fc8e36d4749277631dfc711393aa0 (patch) | |
| tree | 0843a4082dc39cb70f48f4c4691ff310fd1bc39e /net | |
| parent | d152b4e1e9a18f332ecd9e66492d706edc083345 (diff) | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/act_api.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 9b2e3975be0..599423cc9d0 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -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); err = tcf_action_dump_1(skb, a, bind, ref); if (err < 0) - goto rtattr_failure; + goto errout; r->rta_len = skb->tail - (u8*)r; } return 0; rtattr_failure: + err = -EINVAL; +errout: skb_trim(skb, b - skb->data); - return -err; + return err; } struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est, |