Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <135a45b2c388fbaf9db4620cb01b95230709b9ac.camel@gmail.com>
Subject: Re: [PATCH net-next] net: ethtool: Fix out-of-bounds copy to user
From:   Alexander H Duyck <alexander.duyck@gmail.com>
To:     Ding Hui <dinghui@sangfor.com.cn>, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        pengdonglin@sangfor.com.cn, huangcun@sangfor.com.cn
Date:   Thu, 01 Jun 2023 08:04:01 -0700
In-Reply-To: <20230601112839.13799-1-dinghui@sangfor.com.cn>
References: <20230601112839.13799-1-dinghui@sangfor.com.cn>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-3.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Thu, 2023-06-01 at 19:28 +0800, Ding Hui wrote:
> When we get statistics by ethtool during changing the number of NIC
> channels greater, the utility may crash due to memory corruption.
>=20
> The NIC drivers callback get_sset_count() could return a calculated
> length depends on current number of channels (e.g. i40e, igb).
>=20

The drivers shouldn't be changing that value. If the drivers are doing
this they should be fixed to provide a fixed length in terms of their
strings.

> The ethtool allocates a user buffer with the first ioctl returned
> length and invokes the second ioctl to get data. The kernel copies
> data to the user buffer but without checking its length. If the length
> returned by the second get_sset_count() is greater than the length
> allocated by the user, it will lead to an out-of-bounds copy.
>=20
> Fix it by restricting the copy length not exceed the buffer length
> specified by userspace.
>=20
> Signed-off-by: Ding Hui <dinghui@sangfor.com.cn>

Changing the copy size would not fix this. The problem is the driver
will be overwriting with the size that it thinks it should be using.
Reducing the value that is provided for the memory allocations will
cause the driver to corrupt memory.

> ---
>  net/ethtool/ioctl.c | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>=20
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 6bb778e10461..82a975a9c895 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -1902,7 +1902,7 @@ static int ethtool_self_test(struct net_device *dev=
, char __user *useraddr)
>  	if (copy_from_user(&test, useraddr, sizeof(test)))
>  		return -EFAULT;
> =20
> -	test.len =3D test_len;
> +	test.len =3D min_t(u32, test.len, test_len);
>  	data =3D kcalloc(test_len, sizeof(u64), GFP_USER);
>  	if (!data)
>  		return -ENOMEM;

This is the wrong spot to be doing this. You need to use test_len for
your allocation as that is what the driver will be writing to. You
should look at adjusting after the allocation call and before you do
the copy

> @@ -1915,7 +1915,8 @@ static int ethtool_self_test(struct net_device *dev=
, char __user *useraddr)
>  	if (copy_to_user(useraddr, &test, sizeof(test)))
>  		goto out;
>  	useraddr +=3D sizeof(test);
> -	if (copy_to_user(useraddr, data, array_size(test.len, sizeof(u64))))
> +	if (test.len &&
> +	    copy_to_user(useraddr, data, array_size(test.len, sizeof(u64))))
>  		goto out;
>  	ret =3D 0;
> =20

I don't believe this is adding any value. I wouldn't bother with
checking for lengths of 0.

> @@ -1940,10 +1941,10 @@ static int ethtool_get_strings(struct net_device =
*dev, void __user *useraddr)
>  		return -ENOMEM;
>  	WARN_ON_ONCE(!ret);
> =20
> -	gstrings.len =3D ret;
> +	gstrings.len =3D min_t(u32, gstrings.len, ret);
> =20
>  	if (gstrings.len) {
> -		data =3D vzalloc(array_size(gstrings.len, ETH_GSTRING_LEN));
> +		data =3D vzalloc(array_size(ret, ETH_GSTRING_LEN));
>  		if (!data)
>  			return -ENOMEM;
> =20

Same here. We should be using the returned value for the allocations
and tests, and then doing the min adjustment after the allocationis
completed.

> @@ -2055,9 +2056,9 @@ static int ethtool_get_stats(struct net_device *dev=
, void __user *useraddr)
>  	if (copy_from_user(&stats, useraddr, sizeof(stats)))
>  		return -EFAULT;
> =20
> -	stats.n_stats =3D n_stats;
> +	stats.n_stats =3D min_t(u32, stats.n_stats, n_stats);
> =20
> -	if (n_stats) {
> +	if (stats.n_stats) {
>  		data =3D vzalloc(array_size(n_stats, sizeof(u64)));
>  		if (!data)
>  			return -ENOMEM;

Same here. We should be using n_stats, not stats.n_stats and adjust
before you do the final copy.

> @@ -2070,7 +2071,8 @@ static int ethtool_get_stats(struct net_device *dev=
, void __user *useraddr)
>  	if (copy_to_user(useraddr, &stats, sizeof(stats)))
>  		goto out;
>  	useraddr +=3D sizeof(stats);
> -	if (n_stats && copy_to_user(useraddr, data, array_size(n_stats, sizeof(=
u64))))
> +	if (stats.n_stats &&
> +	    copy_to_user(useraddr, data, array_size(stats.n_stats, sizeof(u64))=
))
>  		goto out;
>  	ret =3D 0;
> =20

Again. I am not sure what value is being added. If n_stats is 0 then I
am pretty sure this will do nothing anyway.