linux-kernel - Re: [PATCH] rtl8723bs/ioctl_linux: Add a security check to copy_from

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190102091016.GA3781@kadam>
Date:   Wed, 2 Jan 2019 12:10:16 +0300
From:   Dan Carpenter <dan.carpenter@...cle.com>
To:     Aditya Pakki <pakki001@....edu>
Cc:     Arushi Singhal <arushisinghal19971997@...il.com>,
        devel@...verdev.osuosl.org,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>, kjlu@....edu,
        linux-kernel@...r.kernel.org,
        Mamta Shukla <mamtashukla555@...il.com>,
        Jia-Ju Bai <baijiaju1990@...il.com>,
        Nathan Chancellor <natechancellor@...il.com>,
        Quytelda Kahja <quytelda@...alin.org>
Subject: Re: [PATCH] rtl8723bs/ioctl_linux: Add a security check to
 copy_from_user()

On Sun, Dec 23, 2018 at 06:13:02PM -0600, Aditya Pakki wrote:
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> index b8631baf128d..9992caa8c839 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> @@ -2577,14 +2577,19 @@ static int rtw_wps_start(struct net_device *dev,
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct iw_point *pdata = &wrqu->data;
>  	u32   u32wps_start = 0;
> -        unsigned int uintRet = 0;
>  
>  	if ((true == padapter->bDriverStopped) ||(true ==padapter->bSurpriseRemoved) || (NULL == pdata)) {
>  		ret = -EINVAL;
>  		goto exit;
>  	}
>  
> -	uintRet = copy_from_user((void*)&u32wps_start, pdata->pointer, 4);
> +	ret = copy_from_user((void *)&u32wps_start, pdata->pointer, 4);
> +
> +	if (ret) {
> +		ret = -EINVAL;
> +		goto exit;

Good eye for spotting this bug.  :)

Really this function is not useful though so we should just delete it.
All the CONFIG_INTEL_WIDI stuff is dead code.

Also if copy_from_user() the correct error code is -EFAULT.  And we
would normally write it like this:

	if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4)) {
		ret = -EFAULT;
		goto exit;
	}

But in this case, since this is dead code we should just delete
rtw_wps_start() and put a NULL in the rtw_private_handler[] array where
it used to be.

regards,
dan carpenter