aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHagen Paul Pfeifer <hagen@jauu.net>2012-02-15 04:09:46 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-29 16:31:00 -0800
commitb21abc775d2095a517f74f6df989569e3131e9c7 (patch)
treef0ba3f7c6bdc493796c4099ba8a3182d2c6ecd08
parenta1845875b3f78fa493087da218c90d09b0294271 (diff)
veth: Enforce minimum size of VETH_INFO_PEER
[ Upstream commit 237114384ab22c174ec4641e809f8e6cbcfce774 ] VETH_INFO_PEER carries struct ifinfomsg plus optional IFLA attributes. A minimal size of sizeof(struct ifinfomsg) must be enforced or we may risk accessing that struct beyond the limits of the netlink message. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/veth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index ef883e97cee..b9073983143 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -423,7 +423,9 @@ static void veth_dellink(struct net_device *dev, struct list_head *head)
unregister_netdevice_queue(peer, head);
}
-static const struct nla_policy veth_policy[VETH_INFO_MAX + 1];
+static const struct nla_policy veth_policy[VETH_INFO_MAX + 1] = {
+ [VETH_INFO_PEER] = { .len = sizeof(struct ifinfomsg) },
+};
static struct rtnl_link_ops veth_link_ops = {
.kind = DRV_NAME,