summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-07-30 00:16:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-11 15:38:44 -0700
commit565144e976ede82df899f30f9e7f8a9d210f60fe (patch)
tree51a8f3f4d32437b4fd9ed3b85d5ba7fead0bd794 /net
parentd8c47c3fdc007ff3efecca98881e8e91eb088d70 (diff)
downloadlwn-565144e976ede82df899f30f9e7f8a9d210f60fe.tar.gz
lwn-565144e976ede82df899f30f9e7f8a9d210f60fe.zip
net_sched: Fix stack info leak in cbq_dump_wrr().
[ Upstream commit a0db856a95a29efb1c23db55c02d9f0ff4f0db48 ] Make sure the reserved fields, and padding (if any), are fully initialized. Based upon a patch by Dan Carpenter and feedback from Joe Perches. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_cbq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index b7cddb95397a..7f599447b3ca 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1467,6 +1467,7 @@ static int cbq_dump_wrr(struct sk_buff *skb, struct cbq_class *cl)
unsigned char *b = skb_tail_pointer(skb);
struct tc_cbq_wrropt opt;
+ memset(&opt, 0, sizeof(opt));
opt.flags = 0;
opt.allot = cl->allot;
opt.priority = cl->priority + 1;