summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-07-30 00:16:21 -0700
committerWilly Tarreau <w@1wt.eu>2014-05-19 07:53:49 +0200
commitdd0938fafe464ffddadf805850fc29967f9d393f (patch)
tree0901aa18dd08701238c0ffbec542a26fb64bcc85 /net/sched
parente409e24ad51215dc0e816aa42e2914fc7911e93d (diff)
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: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net/sched')
-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 5b132c473264..8b6f05d2f3ce 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1458,6 +1458,7 @@ static __inline__ 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;