Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
“52e405eaa9806968e88b35d65e57acad954a5ab5”上不存在“arch/arm/include/uapi/asm/signal.h”
提交 4b3550ef 编写于 作者: P Patrick McHardy 提交者： David S. Miller
浏览文件
操作

[NET_SCHED]: Use nla_nest_start/nla_nest_end 

Use nla_nest_start/nla_nest_end for dumping nested attributes.
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 cee63723
隐藏空白更改
内联 并排
Showing with 166 addition and 133 deletion
net/sched/act_api.c
浏览文件 @ 4b3550ef
...@@ -69,7 +69,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb, ...@@ -69,7 +69,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
{ {
struct tcf_common *p; struct tcf_common *p;
int err = 0, index = -1,i = 0, s_i = 0, n_i = 0; int err = 0, index = -1,i = 0, s_i = 0, n_i = 0;
struct nlattr *r ; struct nlattr *nest;
read_lock_bh(hinfo->lock); read_lock_bh(hinfo->lock);
...@@ -84,15 +84,17 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb, ...@@ -84,15 +84,17 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
continue; continue;
a->priv = p; a->priv = p;
a->order = n_i; a->order = n_i;
r = (struct nlattr *)skb_tail_pointer(skb);
NLA_PUT(skb, a->order, 0, NULL); nest = nla_nest_start(skb, a->order);
if (nest == NULL)
goto nla_put_failure;
err = tcf_action_dump_1(skb, a, 0, 0); err = tcf_action_dump_1(skb, a, 0, 0);
if (err < 0) { if (err < 0) {
index--; index--;
nlmsg_trim(skb, r); nlmsg_trim(skb, nest);
goto done; goto done;
} }
r->nla_len = skb_tail_pointer(skb) - (u8 *)r; nla_nest_end(skb, nest);
n_i++; n_i++;
if (n_i >= TCA_ACT_MAX_PRIO) if (n_i >= TCA_ACT_MAX_PRIO)
goto done; goto done;
...@@ -105,7 +107,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb, ...@@ -105,7 +107,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
return n_i; return n_i;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, r); nla_nest_cancel(skb, nest);
goto done; goto done;
} }
...@@ -113,11 +115,12 @@ static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a, ...@@ -113,11 +115,12 @@ static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a,
struct tcf_hashinfo *hinfo) struct tcf_hashinfo *hinfo)
{ {
struct tcf_common *p, *s_p; struct tcf_common *p, *s_p;
struct nlattr *r ; struct nlattr *nest;
int i= 0, n_i = 0; int i= 0, n_i = 0;
r = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, a->order);
NLA_PUT(skb, a->order, 0, NULL); if (nest == NULL)
goto nla_put_failure;
NLA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind); NLA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind);
for (i = 0; i < (hinfo->hmask + 1); i++) { for (i = 0; i < (hinfo->hmask + 1); i++) {
p = hinfo->htab[tcf_hash(i, hinfo->hmask)]; p = hinfo->htab[tcf_hash(i, hinfo->hmask)];
...@@ -131,11 +134,11 @@ static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a, ...@@ -131,11 +134,11 @@ static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a,
} }
} }
NLA_PUT(skb, TCA_FCNT, 4, &n_i); NLA_PUT(skb, TCA_FCNT, 4, &n_i);
r->nla_len = skb_tail_pointer(skb) - (u8 *)r; nla_nest_end(skb, nest);
return n_i; return n_i;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, r); nla_nest_cancel(skb, nest);
return -EINVAL; return -EINVAL;
} }
...@@ -415,7 +418,7 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) ...@@ -415,7 +418,7 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
{ {
int err = -EINVAL; int err = -EINVAL;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *r; struct nlattr *nest;
if (a->ops == NULL || a->ops->dump == NULL) if (a->ops == NULL || a->ops->dump == NULL)
return err; return err;
...@@ -423,10 +426,11 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) ...@@ -423,10 +426,11 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
NLA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind); NLA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind);
if (tcf_action_copy_stats(skb, a, 0)) if (tcf_action_copy_stats(skb, a, 0))
goto nla_put_failure; goto nla_put_failure;
r = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if ((err = tcf_action_dump_old(skb, a, bind, ref)) > 0) { if ((err = tcf_action_dump_old(skb, a, bind, ref)) > 0) {
r->nla_len = skb_tail_pointer(skb) - (u8 *)r; nla_nest_end(skb, nest);
return err; return err;
} }
...@@ -441,17 +445,17 @@ tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref) ...@@ -441,17 +445,17 @@ tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref)
{ {
struct tc_action *a; struct tc_action *a;
int err = -EINVAL; int err = -EINVAL;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *r ;
while ((a = act) != NULL) { while ((a = act) != NULL) {
r = (struct nlattr *)skb_tail_pointer(skb);
act = a->next; act = a->next;
NLA_PUT(skb, a->order, 0, NULL); nest = nla_nest_start(skb, a->order);
if (nest == NULL)
goto nla_put_failure;
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 errout; goto errout;
r->nla_len = skb_tail_pointer(skb) - (u8 *)r; nla_nest_end(skb, nest);
} }
return 0; return 0;
...@@ -459,7 +463,7 @@ tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref) ...@@ -459,7 +463,7 @@ tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref)
nla_put_failure: nla_put_failure:
err = -EINVAL; err = -EINVAL;
errout: errout:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return err; return err;
} }
...@@ -627,7 +631,7 @@ tca_get_fill(struct sk_buff *skb, struct tc_action *a, u32 pid, u32 seq, ...@@ -627,7 +631,7 @@ tca_get_fill(struct sk_buff *skb, struct tc_action *a, u32 pid, u32 seq,
struct tcamsg *t; struct tcamsg *t;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *x; struct nlattr *nest;
nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*t), flags); nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*t), flags);
...@@ -636,13 +640,14 @@ tca_get_fill(struct sk_buff *skb, struct tc_action *a, u32 pid, u32 seq, ...@@ -636,13 +640,14 @@ tca_get_fill(struct sk_buff *skb, struct tc_action *a, u32 pid, u32 seq,
t->tca__pad1 = 0; t->tca__pad1 = 0;
t->tca__pad2 = 0; t->tca__pad2 = 0;
x = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, TCA_ACT_TAB);
NLA_PUT(skb, TCA_ACT_TAB, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (tcf_action_dump(skb, a, bind, ref) < 0) if (tcf_action_dump(skb, a, bind, ref) < 0)
goto nla_put_failure; goto nla_put_failure;
x->nla_len = skb_tail_pointer(skb) - (u8 *)x; nla_nest_end(skb, nest);
nlh->nlmsg_len = skb_tail_pointer(skb) - b; nlh->nlmsg_len = skb_tail_pointer(skb) - b;
return skb->len; return skb->len;
...@@ -743,7 +748,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) ...@@ -743,7 +748,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid)
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct tcamsg *t; struct tcamsg *t;
struct netlink_callback dcb; struct netlink_callback dcb;
struct nlattr *x; struct nlattr *nest;
struct nlattr *tb[TCA_ACT_MAX+1]; struct nlattr *tb[TCA_ACT_MAX+1];
struct nlattr *kind; struct nlattr *kind;
struct tc_action *a = create_a(0); struct tc_action *a = create_a(0);
...@@ -779,14 +784,15 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) ...@@ -779,14 +784,15 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid)
t->tca__pad1 = 0; t->tca__pad1 = 0;
t->tca__pad2 = 0; t->tca__pad2 = 0;
x = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, TCA_ACT_TAB);
NLA_PUT(skb, TCA_ACT_TAB, 0, NULL); if (nest == NULL)
goto nla_put_failure;
err = a->ops->walk(skb, &dcb, RTM_DELACTION, a); err = a->ops->walk(skb, &dcb, RTM_DELACTION, a);
if (err < 0) if (err < 0)
goto nla_put_failure; goto nla_put_failure;
x->nla_len = skb_tail_pointer(skb) - (u8 *)x; nla_nest_end(skb, nest);
nlh->nlmsg_len = skb_tail_pointer(skb) - b; nlh->nlmsg_len = skb_tail_pointer(skb) - b;
nlh->nlmsg_flags |= NLM_F_ROOT; nlh->nlmsg_flags |= NLM_F_ROOT;
...@@ -875,7 +881,7 @@ static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event, ...@@ -875,7 +881,7 @@ static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event,
struct tcamsg *t; struct tcamsg *t;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct sk_buff *skb; struct sk_buff *skb;
struct nlattr *x; struct nlattr *nest;
unsigned char *b; unsigned char *b;
int err = 0; int err = 0;
...@@ -891,13 +897,14 @@ static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event, ...@@ -891,13 +897,14 @@ static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event,
t->tca__pad1 = 0; t->tca__pad1 = 0;
t->tca__pad2 = 0; t->tca__pad2 = 0;
x = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, TCA_ACT_TAB);
NLA_PUT(skb, TCA_ACT_TAB, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (tcf_action_dump(skb, a, 0, 0) < 0) if (tcf_action_dump(skb, a, 0, 0) < 0)
goto nla_put_failure; goto nla_put_failure;
x->nla_len = skb_tail_pointer(skb) - (u8 *)x; nla_nest_end(skb, nest);
nlh->nlmsg_len = skb_tail_pointer(skb) - b; nlh->nlmsg_len = skb_tail_pointer(skb) - b;
NETLINK_CB(skb).dst_group = RTNLGRP_TC; NETLINK_CB(skb).dst_group = RTNLGRP_TC;
...@@ -1025,7 +1032,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -1025,7 +1032,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
struct net *net = skb->sk->sk_net; struct net *net = skb->sk->sk_net;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *x; struct nlattr *nest;
struct tc_action_ops *a_o; struct tc_action_ops *a_o;
struct tc_action a; struct tc_action a;
int ret = 0; int ret = 0;
...@@ -1060,18 +1067,19 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -1060,18 +1067,19 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
t->tca__pad1 = 0; t->tca__pad1 = 0;
t->tca__pad2 = 0; t->tca__pad2 = 0;
x = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, TCA_ACT_TAB);
NLA_PUT(skb, TCA_ACT_TAB, 0, NULL); if (nest == NULL)
goto nla_put_failure;
ret = a_o->walk(skb, cb, RTM_GETACTION, &a); ret = a_o->walk(skb, cb, RTM_GETACTION, &a);
if (ret < 0) if (ret < 0)
goto nla_put_failure; goto nla_put_failure;
if (ret > 0) { if (ret > 0) {
x->nla_len = skb_tail_pointer(skb) - (u8 *)x; nla_nest_end(skb, nest);
ret = skb->len; ret = skb->len;
} else } else
nlmsg_trim(skb, x); nla_nest_cancel(skb, nest);
nlh->nlmsg_len = skb_tail_pointer(skb) - b; nlh->nlmsg_len = skb_tail_pointer(skb) - b;
if (NETLINK_CB(cb->skb).pid && ret) if (NETLINK_CB(cb->skb).pid && ret)
......
net/sched/act_police.c
浏览文件 @ 4b3550ef
...@@ -54,7 +54,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c ...@@ -54,7 +54,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c
{ {
struct tcf_common *p; struct tcf_common *p;
int err = 0, index = -1, i = 0, s_i = 0, n_i = 0; int err = 0, index = -1, i = 0, s_i = 0, n_i = 0;
struct nlattr *r; struct nlattr *nest;
read_lock_bh(&police_lock); read_lock_bh(&police_lock);
...@@ -69,18 +69,19 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c ...@@ -69,18 +69,19 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c
continue; continue;
a->priv = p; a->priv = p;
a->order = index; a->order = index;
r = (struct nlattr *)skb_tail_pointer(skb); nest = nla_nest_start(skb, a->order);
NLA_PUT(skb, a->order, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (type == RTM_DELACTION) if (type == RTM_DELACTION)
err = tcf_action_dump_1(skb, a, 0, 1); err = tcf_action_dump_1(skb, a, 0, 1);
else else
err = tcf_action_dump_1(skb, a, 0, 0); err = tcf_action_dump_1(skb, a, 0, 0);
if (err < 0) { if (err < 0) {
index--; index--;
nlmsg_trim(skb, r); nla_nest_cancel(skb, nest);
goto done; goto done;
} }
r->nla_len = skb_tail_pointer(skb) - (u8 *)r; nla_nest_end(skb, nest);
n_i++; n_i++;
} }
} }
...@@ -91,7 +92,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c ...@@ -91,7 +92,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c
return n_i; return n_i;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, r); nla_nest_cancel(skb, nest);
goto done; goto done;
} }
......
net/sched/cls_api.c
浏览文件 @ 4b3550ef
...@@ -544,18 +544,22 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts, ...@@ -544,18 +544,22 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
* to work with both old and new modes of entering * to work with both old and new modes of entering
* tc data even if iproute2 was newer - jhs * tc data even if iproute2 was newer - jhs
*/ */
struct nlattr *p_rta = (struct nlattr *)skb_tail_pointer(skb); struct nlattr *nest;
if (exts->action->type != TCA_OLD_COMPAT) { if (exts->action->type != TCA_OLD_COMPAT) {
NLA_PUT(skb, map->action, 0, NULL); nest = nla_nest_start(skb, map->action);
if (nest == NULL)
goto nla_put_failure;
if (tcf_action_dump(skb, exts->action, 0, 0) < 0) if (tcf_action_dump(skb, exts->action, 0, 0) < 0)
goto nla_put_failure; goto nla_put_failure;
p_rta->nla_len = skb_tail_pointer(skb) - (u8 *)p_rta; nla_nest_end(skb, nest);
} else if (map->police) { } else if (map->police) {
NLA_PUT(skb, map->police, 0, NULL); nest = nla_nest_start(skb, map->police);
if (nest == NULL)
goto nla_put_failure;
if (tcf_action_dump_old(skb, exts->action, 0, 0) < 0) if (tcf_action_dump_old(skb, exts->action, 0, 0) < 0)
goto nla_put_failure; goto nla_put_failure;
p_rta->nla_len = skb_tail_pointer(skb) - (u8 *)p_rta; nla_nest_end(skb, nest);
} }
} }
#endif #endif
......
net/sched/cls_basic.c
浏览文件 @ 4b3550ef
...@@ -246,16 +246,16 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -246,16 +246,16 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh,
struct sk_buff *skb, struct tcmsg *t) struct sk_buff *skb, struct tcmsg *t)
{ {
struct basic_filter *f = (struct basic_filter *) fh; struct basic_filter *f = (struct basic_filter *) fh;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
if (f == NULL) if (f == NULL)
return skb->len; return skb->len;
t->tcm_handle = f->handle; t->tcm_handle = f->handle;
nla = (struct nlattr *) b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (f->res.classid) if (f->res.classid)
NLA_PUT(skb, TCA_BASIC_CLASSID, sizeof(u32), &f->res.classid); NLA_PUT(skb, TCA_BASIC_CLASSID, sizeof(u32), &f->res.classid);
...@@ -264,11 +264,11 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -264,11 +264,11 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh,
tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 0) tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
net/sched/cls_fw.c
浏览文件 @ 4b3550ef
...@@ -334,7 +334,7 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -334,7 +334,7 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh,
struct fw_head *head = (struct fw_head *)tp->root; struct fw_head *head = (struct fw_head *)tp->root;
struct fw_filter *f = (struct fw_filter*)fh; struct fw_filter *f = (struct fw_filter*)fh;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *nla; struct nlattr *nest;
if (f == NULL) if (f == NULL)
return skb->len; return skb->len;
...@@ -344,8 +344,9 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -344,8 +344,9 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh,
if (!f->res.classid && !tcf_exts_is_available(&f->exts)) if (!f->res.classid && !tcf_exts_is_available(&f->exts))
return skb->len; return skb->len;
nla = (struct nlattr*)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (f->res.classid) if (f->res.classid)
NLA_PUT(skb, TCA_FW_CLASSID, 4, &f->res.classid); NLA_PUT(skb, TCA_FW_CLASSID, 4, &f->res.classid);
...@@ -359,7 +360,7 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -359,7 +360,7 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh,
if (tcf_exts_dump(skb, &f->exts, &fw_ext_map) < 0) if (tcf_exts_dump(skb, &f->exts, &fw_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
if (tcf_exts_dump_stats(skb, &f->exts, &fw_ext_map) < 0) if (tcf_exts_dump_stats(skb, &f->exts, &fw_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
......
net/sched/cls_route.c
浏览文件 @ 4b3550ef
...@@ -551,7 +551,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -551,7 +551,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh,
{ {
struct route4_filter *f = (struct route4_filter*)fh; struct route4_filter *f = (struct route4_filter*)fh;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *nla; struct nlattr *nest;
u32 id; u32 id;
if (f == NULL) if (f == NULL)
...@@ -559,8 +559,9 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -559,8 +559,9 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh,
t->tcm_handle = f->handle; t->tcm_handle = f->handle;
nla = (struct nlattr*)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (!(f->handle&0x8000)) { if (!(f->handle&0x8000)) {
id = f->id&0xFF; id = f->id&0xFF;
...@@ -579,7 +580,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -579,7 +580,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh,
if (tcf_exts_dump(skb, &f->exts, &route_ext_map) < 0) if (tcf_exts_dump(skb, &f->exts, &route_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0) if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
......
net/sched/cls_rsvp.h
浏览文件 @ 4b3550ef
...@@ -595,7 +595,7 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -595,7 +595,7 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
struct rsvp_filter *f = (struct rsvp_filter*)fh; struct rsvp_filter *f = (struct rsvp_filter*)fh;
struct rsvp_session *s; struct rsvp_session *s;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *nla; struct nlattr *nest;
struct tc_rsvp_pinfo pinfo; struct tc_rsvp_pinfo pinfo;
if (f == NULL) if (f == NULL)
...@@ -604,9 +604,9 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -604,9 +604,9 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
t->tcm_handle = f->handle; t->tcm_handle = f->handle;
nest = nla_nest_start(skb, TCA_OPTIONS);
nla = (struct nlattr*)b; if (nest == NULL)
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); goto nla_put_failure;
NLA_PUT(skb, TCA_RSVP_DST, sizeof(s->dst), &s->dst); NLA_PUT(skb, TCA_RSVP_DST, sizeof(s->dst), &s->dst);
pinfo.dpi = s->dpi; pinfo.dpi = s->dpi;
...@@ -624,7 +624,7 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -624,7 +624,7 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
if (tcf_exts_dump(skb, &f->exts, &rsvp_ext_map) < 0) if (tcf_exts_dump(skb, &f->exts, &rsvp_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
if (tcf_exts_dump_stats(skb, &f->exts, &rsvp_ext_map) < 0) if (tcf_exts_dump_stats(skb, &f->exts, &rsvp_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
......
net/sched/cls_tcindex.c
浏览文件 @ 4b3550ef
...@@ -437,13 +437,16 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -437,13 +437,16 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
struct tcindex_data *p = PRIV(tp); struct tcindex_data *p = PRIV(tp);
struct tcindex_filter_result *r = (struct tcindex_filter_result *) fh; struct tcindex_filter_result *r = (struct tcindex_filter_result *) fh;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct nlattr *nla; struct nlattr *nest;
pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p,b %p\n", pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p,b %p\n",
tp, fh, skb, t, p, r, b); tp, fh, skb, t, p, r, b);
pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h); pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h);
nla = (struct nlattr *) b;
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); nest = nla_nest_start(skb, TCA_OPTIONS);
if (nest == NULL)
goto nla_put_failure;
if (!fh) { if (!fh) {
t->tcm_handle = ~0; /* whatever ... */ t->tcm_handle = ~0; /* whatever ... */
NLA_PUT(skb, TCA_TCINDEX_HASH, sizeof(p->hash), &p->hash); NLA_PUT(skb, TCA_TCINDEX_HASH, sizeof(p->hash), &p->hash);
...@@ -451,7 +454,7 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -451,7 +454,7 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
NLA_PUT(skb, TCA_TCINDEX_SHIFT, sizeof(p->shift), &p->shift); NLA_PUT(skb, TCA_TCINDEX_SHIFT, sizeof(p->shift), &p->shift);
NLA_PUT(skb, TCA_TCINDEX_FALL_THROUGH, sizeof(p->fall_through), NLA_PUT(skb, TCA_TCINDEX_FALL_THROUGH, sizeof(p->fall_through),
&p->fall_through); &p->fall_through);
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
} else { } else {
if (p->perfect) { if (p->perfect) {
t->tcm_handle = r-p->perfect; t->tcm_handle = r-p->perfect;
...@@ -474,7 +477,7 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -474,7 +477,7 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
if (tcf_exts_dump(skb, &r->exts, &tcindex_ext_map) < 0) if (tcf_exts_dump(skb, &r->exts, &tcindex_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
if (tcf_exts_dump_stats(skb, &r->exts, &tcindex_ext_map) < 0) if (tcf_exts_dump_stats(skb, &r->exts, &tcindex_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
......
net/sched/cls_u32.c
浏览文件 @ 4b3550ef
...@@ -694,16 +694,16 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -694,16 +694,16 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh,
struct sk_buff *skb, struct tcmsg *t) struct sk_buff *skb, struct tcmsg *t)
{ {
struct tc_u_knode *n = (struct tc_u_knode*)fh; struct tc_u_knode *n = (struct tc_u_knode*)fh;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
if (n == NULL) if (n == NULL)
return skb->len; return skb->len;
t->tcm_handle = n->handle; t->tcm_handle = n->handle;
nla = (struct nlattr*)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (TC_U32_KEY(n->handle) == 0) { if (TC_U32_KEY(n->handle) == 0) {
struct tc_u_hnode *ht = (struct tc_u_hnode*)fh; struct tc_u_hnode *ht = (struct tc_u_hnode*)fh;
...@@ -741,14 +741,15 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -741,14 +741,15 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh,
#endif #endif
} }
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
if (TC_U32_KEY(n->handle)) if (TC_U32_KEY(n->handle))
if (tcf_exts_dump_stats(skb, &n->exts, &u32_ext_map) < 0) if (tcf_exts_dump_stats(skb, &n->exts, &u32_ext_map) < 0)
goto nla_put_failure; goto nla_put_failure;
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
net/sched/ematch.c
浏览文件 @ 4b3550ef
...@@ -436,14 +436,18 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv) ...@@ -436,14 +436,18 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv)
{ {
int i; int i;
u8 *tail; u8 *tail;
struct nlattr *top_start = (struct nlattr *)skb_tail_pointer(skb); struct nlattr *top_start;
struct nlattr *list_start; struct nlattr *list_start;
NLA_PUT(skb, tlv, 0, NULL); top_start = nla_nest_start(skb, tlv);
if (top_start == NULL)
goto nla_put_failure;
NLA_PUT(skb, TCA_EMATCH_TREE_HDR, sizeof(tree->hdr), &tree->hdr); NLA_PUT(skb, TCA_EMATCH_TREE_HDR, sizeof(tree->hdr), &tree->hdr);
list_start = (struct nlattr *)skb_tail_pointer(skb); list_start = nla_nest_start(skb, TCA_EMATCH_TREE_LIST);
NLA_PUT(skb, TCA_EMATCH_TREE_LIST, 0, NULL); if (list_start == NULL)
goto nla_put_failure;
tail = skb_tail_pointer(skb); tail = skb_tail_pointer(skb);
for (i = 0; i < tree->hdr.nmatches; i++) { for (i = 0; i < tree->hdr.nmatches; i++) {
...@@ -470,8 +474,8 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv) ...@@ -470,8 +474,8 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv)
match_start->nla_len = tail - (u8 *)match_start; match_start->nla_len = tail - (u8 *)match_start;
} }
list_start->nla_len = tail - (u8 *)list_start; nla_nest_end(skb, list_start);
top_start->nla_len = tail - (u8 *)top_start; nla_nest_end(skb, top_start);
return 0; return 0;
......
net/sched/sch_atm.c
浏览文件 @ 4b3550ef
...@@ -605,8 +605,7 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl, ...@@ -605,8 +605,7 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl,
{ {
struct atm_qdisc_data *p = qdisc_priv(sch); struct atm_qdisc_data *p = qdisc_priv(sch);
struct atm_flow_data *flow = (struct atm_flow_data *)cl; struct atm_flow_data *flow = (struct atm_flow_data *)cl;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
pr_debug("atm_tc_dump_class(sch %p,[qdisc %p],flow %p,skb %p,tcm %p)\n", pr_debug("atm_tc_dump_class(sch %p,[qdisc %p],flow %p,skb %p,tcm %p)\n",
sch, p, flow, skb, tcm); sch, p, flow, skb, tcm);
...@@ -614,8 +613,11 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl, ...@@ -614,8 +613,11 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl,
return -EINVAL; return -EINVAL;
tcm->tcm_handle = flow->classid; tcm->tcm_handle = flow->classid;
tcm->tcm_info = flow->q->handle; tcm->tcm_info = flow->q->handle;
nla = (struct nlattr *)b;
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); nest = nla_nest_start(skb, TCA_OPTIONS);
if (nest == NULL)
goto nla_put_failure;
NLA_PUT(skb, TCA_ATM_HDR, flow->hdr_len, flow->hdr); NLA_PUT(skb, TCA_ATM_HDR, flow->hdr_len, flow->hdr);
if (flow->vcc) { if (flow->vcc) {
struct sockaddr_atmpvc pvc; struct sockaddr_atmpvc pvc;
...@@ -636,11 +638,12 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl, ...@@ -636,11 +638,12 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl,
NLA_PUT(skb, TCA_ATM_EXCESS, sizeof(zero), &zero); NLA_PUT(skb, TCA_ATM_EXCESS, sizeof(zero), &zero);
} }
nla->nla_len = skb_tail_pointer(skb) - b;
nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
static int static int
......
net/sched/sch_cbq.c
浏览文件 @ 4b3550ef
...@@ -1565,18 +1565,18 @@ static int cbq_dump_attr(struct sk_buff *skb, struct cbq_class *cl) ...@@ -1565,18 +1565,18 @@ static int cbq_dump_attr(struct sk_buff *skb, struct cbq_class *cl)
static int cbq_dump(struct Qdisc *sch, struct sk_buff *skb) static int cbq_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
struct cbq_sched_data *q = qdisc_priv(sch); struct cbq_sched_data *q = qdisc_priv(sch);
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
nla = (struct nlattr*)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (cbq_dump_attr(skb, &q->link) < 0) if (cbq_dump_attr(skb, &q->link) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
...@@ -1594,8 +1594,7 @@ cbq_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1594,8 +1594,7 @@ cbq_dump_class(struct Qdisc *sch, unsigned long arg,
struct sk_buff *skb, struct tcmsg *tcm) struct sk_buff *skb, struct tcmsg *tcm)
{ {
struct cbq_class *cl = (struct cbq_class*)arg; struct cbq_class *cl = (struct cbq_class*)arg;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
if (cl->tparent) if (cl->tparent)
tcm->tcm_parent = cl->tparent->classid; tcm->tcm_parent = cl->tparent->classid;
...@@ -1604,15 +1603,16 @@ cbq_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1604,15 +1603,16 @@ cbq_dump_class(struct Qdisc *sch, unsigned long arg,
tcm->tcm_handle = cl->classid; tcm->tcm_handle = cl->classid;
tcm->tcm_info = cl->q->handle; tcm->tcm_info = cl->q->handle;
nla = (struct nlattr*)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
if (cbq_dump_attr(skb, cl) < 0) if (cbq_dump_attr(skb, cl) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
net/sched/sch_hfsc.c
浏览文件 @ 4b3550ef
...@@ -1343,22 +1343,23 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb, ...@@ -1343,22 +1343,23 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,
struct tcmsg *tcm) struct tcmsg *tcm)
{ {
struct hfsc_class *cl = (struct hfsc_class *)arg; struct hfsc_class *cl = (struct hfsc_class *)arg;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla = (struct nlattr *)b;
tcm->tcm_parent = cl->cl_parent ? cl->cl_parent->classid : TC_H_ROOT; tcm->tcm_parent = cl->cl_parent ? cl->cl_parent->classid : TC_H_ROOT;
tcm->tcm_handle = cl->classid; tcm->tcm_handle = cl->classid;
if (cl->level == 0) if (cl->level == 0)
tcm->tcm_info = cl->qdisc->handle; tcm->tcm_info = cl->qdisc->handle;
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); nest = nla_nest_start(skb, TCA_OPTIONS);
if (nest == NULL)
goto nla_put_failure;
if (hfsc_dump_curves(skb, cl) < 0) if (hfsc_dump_curves(skb, cl) < 0)
goto nla_put_failure; goto nla_put_failure;
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
net/sched/sch_htb.c
浏览文件 @ 4b3550ef
...@@ -1043,25 +1043,29 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt) ...@@ -1043,25 +1043,29 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt)
static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
struct tc_htb_glob gopt; struct tc_htb_glob gopt;
spin_lock_bh(&sch->dev->queue_lock); spin_lock_bh(&sch->dev->queue_lock);
gopt.direct_pkts = q->direct_pkts;
gopt.direct_pkts = q->direct_pkts;
gopt.version = HTB_VER; gopt.version = HTB_VER;
gopt.rate2quantum = q->rate2quantum; gopt.rate2quantum = q->rate2quantum;
gopt.defcls = q->defcls; gopt.defcls = q->defcls;
gopt.debug = 0; gopt.debug = 0;
nla = (struct nlattr *)b;
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); nest = nla_nest_start(skb, TCA_OPTIONS);
if (nest == NULL)
goto nla_put_failure;
NLA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt); NLA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt);
nla->nla_len = skb_tail_pointer(skb) - b; nla_nest_end(skb, nest);
spin_unlock_bh(&sch->dev->queue_lock); spin_unlock_bh(&sch->dev->queue_lock);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
spin_unlock_bh(&sch->dev->queue_lock); spin_unlock_bh(&sch->dev->queue_lock);
nlmsg_trim(skb, skb_tail_pointer(skb)); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
...@@ -1069,8 +1073,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1069,8 +1073,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
struct sk_buff *skb, struct tcmsg *tcm) struct sk_buff *skb, struct tcmsg *tcm)
{ {
struct htb_class *cl = (struct htb_class *)arg; struct htb_class *cl = (struct htb_class *)arg;
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
struct tc_htb_opt opt; struct tc_htb_opt opt;
spin_lock_bh(&sch->dev->queue_lock); spin_lock_bh(&sch->dev->queue_lock);
...@@ -1079,8 +1082,9 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1079,8 +1082,9 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
if (!cl->level && cl->un.leaf.q) if (!cl->level && cl->un.leaf.q)
tcm->tcm_info = cl->un.leaf.q->handle; tcm->tcm_info = cl->un.leaf.q->handle;
nla = (struct nlattr *)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
memset(&opt, 0, sizeof(opt)); memset(&opt, 0, sizeof(opt));
...@@ -1092,12 +1096,14 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1092,12 +1096,14 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
opt.prio = cl->un.leaf.prio; opt.prio = cl->un.leaf.prio;
opt.level = cl->level; opt.level = cl->level;
NLA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt); NLA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt);
nla->nla_len = skb_tail_pointer(skb) - b;
nla_nest_end(skb, nest);
spin_unlock_bh(&sch->dev->queue_lock); spin_unlock_bh(&sch->dev->queue_lock);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
spin_unlock_bh(&sch->dev->queue_lock); spin_unlock_bh(&sch->dev->queue_lock);
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
net/sched/sch_ingress.c
浏览文件 @ 4b3550ef
...@@ -183,16 +183,16 @@ static void ingress_destroy(struct Qdisc *sch) ...@@ -183,16 +183,16 @@ static void ingress_destroy(struct Qdisc *sch)
static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb) static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
nla = (struct nlattr *)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
nla->nla_len = skb_tail_pointer(skb) - b; goto nla_put_failure;
nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
net/sched/sch_tbf.c
浏览文件 @ 4b3550ef
...@@ -375,12 +375,12 @@ static void tbf_destroy(struct Qdisc *sch) ...@@ -375,12 +375,12 @@ static void tbf_destroy(struct Qdisc *sch)
static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
struct tbf_sched_data *q = qdisc_priv(sch); struct tbf_sched_data *q = qdisc_priv(sch);
unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest;
struct nlattr *nla;
struct tc_tbf_qopt opt; struct tc_tbf_qopt opt;
nla = (struct nlattr*)b; nest = nla_nest_start(skb, TCA_OPTIONS);
NLA_PUT(skb, TCA_OPTIONS, 0, NULL); if (nest == NULL)
goto nla_put_failure;
opt.limit = q->limit; opt.limit = q->limit;
opt.rate = q->R_tab->rate; opt.rate = q->R_tab->rate;
...@@ -391,12 +391,12 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) ...@@ -391,12 +391,12 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb)
opt.mtu = q->mtu; opt.mtu = q->mtu;
opt.buffer = q->buffer; opt.buffer = q->buffer;
NLA_PUT(skb, TCA_TBF_PARMS, sizeof(opt), &opt); NLA_PUT(skb, TCA_TBF_PARMS, sizeof(opt), &opt);
nla->nla_len = skb_tail_pointer(skb) - b;
nla_nest_end(skb, nest);
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
nlmsg_trim(skb, b); nla_nest_cancel(skb, nest);
return -1; return -1;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或