Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3559597pxv; Mon, 28 Jun 2021 07:24:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZj+rdst1H3NSFg4318bcEyZSz17KLWxDrjMnsj4dzQHi2K+Ds4VTGxzsXWDH9FUGHKUHQ X-Received: by 2002:a5d:8743:: with SMTP id k3mr6372137iol.187.1624890241873; Mon, 28 Jun 2021 07:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624890241; cv=none; d=google.com; s=arc-20160816; b=0u7XGxpJgAempbZbNvhO+gDnl9mvpEGn02gG7QZhkXc5NI/lf0p6mlg0t9KG6r4f9M 6rpKb9OaUkT2yhbV1BSbS3MmQ+bLz1m3TVErunSQ9Ce7QqKvpWnsKCWkQhv6FCriTYbD M6c9v1R73sIG/vfJPqDsIVp/4ZJyr7jjEgu6MK5mJvH8uuTMUsER/CpH6Yllra+/1rh8 2YJf3LOLSz2OjgDio1d4sfyca1Zx+l7GRJX+K1CL7RpHWo05YXyRj9wZ2fDFE/HI+Qaw OKakhmDizGPcc/UKCHLyAUoCDIxf/wL7tZ3IV2ZMsIyXF5O+hzS9HOnMVc5rDs3UNq/J lswA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yfVvP3SM8ohPZAW2rzYwxweGcefqp/Xj7rBc1UO4J+M=; b=SB6PS6jdv5/6DoFwPJ8cArMsyZtl7qiEGsLF3wXizoSpw0ZHwyZwbarnej5ITTJaLC YE5A9MPfmS4NkGK961GLTdhPYQ00URCGDD7WlMKAmfKbroLYbso3WrbQp3+hKmYt+glF ppMSe7h2CD99/+bHrOVPbHMeRpFf4b8ZCLPwzZpZSp9vkg2huPqqutjTaS4anawqUbd6 5iVa3jutoGHT5Sr6alsav5MWfC6Jsw2lTqcFe+BpROpbkWbU4TirIQUhcSU3cWg8V3cw 36tV1Dij6g/JpGOHCp6HncDTRpCVeaB+tb39kuIVGbPnTveUbyZjRB8RZ5aXwdVJL/Oc r6bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CdZzcfdJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d16si9596120ilf.112.2021.06.28.07.23.49; Mon, 28 Jun 2021 07:24:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CdZzcfdJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232549AbhF1OX6 (ORCPT + 99 others); Mon, 28 Jun 2021 10:23:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:54496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232809AbhF1OV0 (ORCPT ); Mon, 28 Jun 2021 10:21:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 755C361C76; Mon, 28 Jun 2021 14:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624889941; bh=IOgvidZQzMgo5df7Ci7e10eBB5bc9HzdtFcfIKzNLOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CdZzcfdJHneYIpg6pMMHGUiOHvAgKwjQVw1WvTyRgqjr/Z6Xl9/J33v+lgQ6+YZ7q IWUH97AhOD+YuJ1eHP8Z4+Q6NBb+AZ5nWepzXpE+JJWwYuymRmB1qXdFKj5udjb9oo J8aFxmQlQix18sO9fG5GNEAPmPm/1Jco3e57NbP+ZxyY9y2KfyBVRpTQDxIN1VZkdG D5ZoLiR2UNfCIW43sOpq9+DrZ+oG+uweDCyScB1ouuClXndkBckUKZSr0tmBkYo+MG 9UMNHdzQy0ULXYsmmLV/LZk7aN1XpLdebsIAqqa77N4DkgY9EoAiznZ0aN33YC5FIx GcEzbNJ1yAJxA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Austin Kim , "David S . Miller" , Sasha Levin Subject: [PATCH 5.12 036/110] net: ethtool: clear heap allocations for ethtool function Date: Mon, 28 Jun 2021 10:17:14 -0400 Message-Id: <20210628141828.31757-37-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628141828.31757-1-sashal@kernel.org> References: <20210628141828.31757-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.14-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.12.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.12.14-rc1 X-KernelTest-Deadline: 2021-06-30T14:18+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Austin Kim [ Upstream commit 80ec82e3d2c1fab42eeb730aaa7985494a963d3f ] Several ethtool functions leave heap uncleared (potentially) by drivers. This will leave the unused portion of heap unchanged and might copy the full contents back to userspace. Signed-off-by: Austin Kim Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ethtool/ioctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 2603966da904..e910890a868c 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1421,7 +1421,7 @@ static int ethtool_get_any_eeprom(struct net_device *dev, void __user *useraddr, if (eeprom.offset + eeprom.len > total_len) return -EINVAL; - data = kmalloc(PAGE_SIZE, GFP_USER); + data = kzalloc(PAGE_SIZE, GFP_USER); if (!data) return -ENOMEM; @@ -1486,7 +1486,7 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr) if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev)) return -EINVAL; - data = kmalloc(PAGE_SIZE, GFP_USER); + data = kzalloc(PAGE_SIZE, GFP_USER); if (!data) return -ENOMEM; @@ -1765,7 +1765,7 @@ static int ethtool_self_test(struct net_device *dev, char __user *useraddr) return -EFAULT; test.len = test_len; - data = kmalloc_array(test_len, sizeof(u64), GFP_USER); + data = kcalloc(test_len, sizeof(u64), GFP_USER); if (!data) return -ENOMEM; @@ -2281,7 +2281,7 @@ static int ethtool_get_tunable(struct net_device *dev, void __user *useraddr) ret = ethtool_tunable_valid(&tuna); if (ret) return ret; - data = kmalloc(tuna.len, GFP_USER); + data = kzalloc(tuna.len, GFP_USER); if (!data) return -ENOMEM; ret = ops->get_tunable(dev, &tuna, data); @@ -2473,7 +2473,7 @@ static int get_phy_tunable(struct net_device *dev, void __user *useraddr) ret = ethtool_phy_tunable_valid(&tuna); if (ret) return ret; - data = kmalloc(tuna.len, GFP_USER); + data = kzalloc(tuna.len, GFP_USER); if (!data) return -ENOMEM; if (phy_drv_tunable) { -- 2.30.2