Messages in this thread Patch in this message | | | Date | Sun, 29 Nov 2015 22:47:33 +0100 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 31/38] [PATCH 31/38] ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 077cb37fcf6f00a45f375161200b5ee0cd4e937b ]
It seems that kernel memory can leak into userspace by a kmalloc, ethtool_get_strings, then copy_to_user sequence.
Avoid this by using kcalloc to zero fill the copied buffer.
Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit 68c3e59aa9cdf2d8870d8fbe4f37b1a509d0abeb)
Signed-off-by: Willy Tarreau <w@1wt.eu> --- net/core/ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index f9e7179..ed17505 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -794,7 +794,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) } } - data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); + data = kcalloc(gstrings.len, ETH_GSTRING_LEN, GFP_USER); if (!data) return -ENOMEM; -- 1.7.12.2.21.g234cd45.dirty
| |