diff options
| author | Kees Cook <kees.cook@canonical.com> | 2010-10-07 10:03:48 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:26:34 -0800 |
| commit | 5c98bcd65f0b27bc36dddbc1c9fe8222ceefc701 (patch) | |
| tree | c7f284e3350d293fcb7c917e4f00d5abe2dc2670 /net | |
| parent | 8993c9cb58ba247dd3c1563689010a660ce86d41 (diff) | |
net: clear heap allocation for ETHTOOL_GRXCLSRLALL
commit ae6df5f96a51818d6376da5307d773baeece4014 upstream.
Calling ETHTOOL_GRXCLSRLALL with a large rule_cnt will allocate kernel
heap without clearing it. For the one driver (niu) that implements it,
it will leave the unused portion of heap unchanged and copy the full
contents back to userspace.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 450862e980c8..abbe8fa66a51 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -265,7 +265,7 @@ static int ethtool_get_rxnfc(struct net_device *dev, if (info.cmd == ETHTOOL_GRXCLSRLALL) { if (info.rule_cnt > 0) { if (info.rule_cnt <= KMALLOC_MAX_SIZE / sizeof(u32)) - rule_buf = kmalloc(info.rule_cnt * sizeof(u32), + rule_buf = kzalloc(info.rule_cnt * sizeof(u32), GFP_USER); if (!rule_buf) return -ENOMEM; |