diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-08-16 20:04:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-17 15:12:15 -0700 |
| commit | 1c40be12f7d8ca1d387510d39787b12e512a7ce8 (patch) | |
| tree | f555374eb0af8cf96d0dafb2444335ee352f73b4 /net/sched/act_skbedit.c | |
| parent | 001389b9581c13fe5fc357a0f89234f85af4215d (diff) | |
| download | kernel_goldelico_gta04-1c40be12f7d8ca1d387510d39787b12e512a7ce8.zip kernel_goldelico_gta04-1c40be12f7d8ca1d387510d39787b12e512a7ce8.tar.gz kernel_goldelico_gta04-1c40be12f7d8ca1d387510d39787b12e512a7ce8.tar.bz2 | |
net sched: fix some kernel memory leaks
We leak at least 32bits of kernel memory to user land in tc dump,
because we dont init all fields (capab ?) of the dumped structure.
Use C99 initializers so that holes and non explicit fields are zeroed.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_skbedit.c')
| -rw-r--r-- | net/sched/act_skbedit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index e9607fe..66cbf4e 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -159,13 +159,14 @@ static inline int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a, { unsigned char *b = skb_tail_pointer(skb); struct tcf_skbedit *d = a->priv; - struct tc_skbedit opt; + struct tc_skbedit opt = { + .index = d->tcf_index, + .refcnt = d->tcf_refcnt - ref, + .bindcnt = d->tcf_bindcnt - bind, + .action = d->tcf_action, + }; struct tcf_t t; - opt.index = d->tcf_index; - opt.refcnt = d->tcf_refcnt - ref; - opt.bindcnt = d->tcf_bindcnt - bind; - opt.action = d->tcf_action; NLA_PUT(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt); if (d->flags & SKBEDIT_F_PRIORITY) NLA_PUT(skb, TCA_SKBEDIT_PRIORITY, sizeof(d->priority), |