summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEran Ben Elisha <eranbe@mellanox.com>2017-01-17 18:19:17 +0100
committerDavid S. Miller <davem@davemloft.net>2017-01-18 20:58:23 +0100
commit31a86d137219373c3222ca5f4f912e9a4d8065bb (patch)
tree83014862d5299fa395f0009b85a1514c955da322 /net
parentMerge tag 'linux-can-fixes-for-4.10-20170118' of git://git.kernel.org/pub/scm... (diff)
downloadlinux-31a86d137219373c3222ca5f4f912e9a4d8065bb.tar.xz
linux-31a86d137219373c3222ca5f4f912e9a4d8065bb.zip
net: ethtool: Initialize buffer when querying device channel settings
Ethtool channels respond struct was uninitialized when querying device channel boundaries settings. As a result, unreported fields by the driver hold garbage. This may cause sending unsupported params to driver. Fixes: 8bf368620486 ('ethtool: ensure channel counts are within bounds ...') Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.com> CC: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index e23766c7e3ba..236a21e3c878 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1712,7 +1712,7 @@ static noinline_for_stack int ethtool_get_channels(struct net_device *dev,
static noinline_for_stack int ethtool_set_channels(struct net_device *dev,
void __user *useraddr)
{
- struct ethtool_channels channels, max;
+ struct ethtool_channels channels, max = { .cmd = ETHTOOL_GCHANNELS };
u32 max_rx_in_use = 0;
if (!dev->ethtool_ops->set_channels || !dev->ethtool_ops->get_channels)