From: Mathias Krause Date: Sat, 9 Mar 2013 05:52:21 +0000 (+0000) Subject: dcbnl: fix various netlink info leaks X-Git-Tag: v2.6.32.61~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e03cad4fb451922fb5371ddec1919b491ad2b08;p=people%2Fms%2Flinux.git dcbnl: fix various netlink info leaks commit 29cd8ae0e1a39e239a3a7b67da1986add1199fc0 upstream. The dcb netlink interface leaks stack memory in various places: * perm_addr[] buffer is only filled at max with 12 of the 32 bytes but copied completely, * no in-kernel driver fills all fields of an IEEE 802.1Qaz subcommand, so we're leaking up to 58 bytes for ieee_ets structs, up to 136 bytes for ieee_pfc structs, etc., * the same is true for CEE -- no in-kernel driver fills the whole struct, Prevent all of the above stack info leaks by properly initializing the buffers/structures involved. Signed-off-by: Mathias Krause Signed-off-by: David S. Miller [bwh: Backported to 2.6.32: no support for IEEE or CEE commands, so only deal with perm_addr] Signed-off-by: Willy Tarreau --- diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index ac1205df6c86..813fe4b137e5 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -307,6 +307,7 @@ static int dcbnl_getperm_hwaddr(struct net_device *netdev, struct nlattr **tb, dcb->dcb_family = AF_UNSPEC; dcb->cmd = DCB_CMD_GPERM_HWADDR; + memset(perm_addr, 0, sizeof(perm_addr)); netdev->dcbnl_ops->getpermhwaddr(netdev, perm_addr); ret = nla_put(dcbnl_skb, DCB_ATTR_PERM_HWADDR, sizeof(perm_addr),