From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753748AbbK2WG0 (ORCPT ); Sun, 29 Nov 2015 17:06:26 -0500 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:56501 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753282AbbK2WB0 (ORCPT ); Sun, 29 Nov 2015 17:01:26 -0500 Message-Id: <20151129214704.206744634@1wt.eu> User-Agent: quilt/0.63-1 Date: Sun, 29 Nov 2015 22:47:33 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Joe Perches , Ben Hutchings , "David S. Miller" , Willy Tarreau Subject: [PATCH 2.6.32 31/38] [PATCH 31/38] ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 In-Reply-To: <8acf8256ccc72771a80b7851061027bc@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Ben Hutchings Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings (cherry picked from commit 68c3e59aa9cdf2d8870d8fbe4f37b1a509d0abeb) Signed-off-by: Willy Tarreau --- 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