aboutsummaryrefslogtreecommitdiffstats
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:23 -0700
commiteaaa6acce02fa975e3d67fd223132e60da31207d (patch)
tree89f05724ef3bc2db931ec705f00b63423cd33334 /net
parent590c955eaaa18c5f1b341093baa60e0d582ba426 (diff)
downloadkernel_samsung_smdk4412-eaaa6acce02fa975e3d67fd223132e60da31207d.zip
kernel_samsung_smdk4412-eaaa6acce02fa975e3d67fd223132e60da31207d.tar.gz
kernel_samsung_smdk4412-eaaa6acce02fa975e3d67fd223132e60da31207d.tar.bz2
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 b7cddb9..7f59944 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;