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;
Date:   Tue, 27 Apr 2021 18:56:55 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     linux-kernel@vger.kernel.org
Cc:     Wenwen Wang <wang6495@umn.edu>,
        "David S . Miller" <davem@davemloft.net>
Subject: Re: [PATCH 185/190] Revert "net: cxgb3_main: fix a missing-check bug"
Message-ID: <YIhCV9zg2OgW0kN3@kroah.com>
References: <20210421130105.1226686-1-gregkh@linuxfoundation.org>
 <20210421130105.1226686-186-gregkh@linuxfoundation.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210421130105.1226686-186-gregkh@linuxfoundation.org>
Precedence: bulk

On Wed, Apr 21, 2021 at 03:01:00PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 2c05d88818ab6571816b93edce4d53703870d7ae.
> 
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes.  The result of these submissions can be found in a
> paper published at the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota).
> 
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix.  Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.
> 
> Cc: Wenwen Wang <wang6495@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 17 -----------------
>  1 file changed, 17 deletions(-)
> 
> diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
> index 84ad7261e243..cc6314aa0154 100644
> --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
> +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
> @@ -2157,8 +2157,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EPERM;
>  		if (copy_from_user(&t, useraddr, sizeof(t)))
>  			return -EFAULT;
> -		if (t.cmd != CHELSIO_SET_QSET_PARAMS)
> -			return -EINVAL;
>  		if (t.qset_idx >= SGE_QSETS)
>  			return -EINVAL;
>  		if (!in_range(t.intr_lat, 0, M_NEWTIMER) ||
> @@ -2258,9 +2256,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  		if (copy_from_user(&t, useraddr, sizeof(t)))
>  			return -EFAULT;
>  
> -		if (t.cmd != CHELSIO_GET_QSET_PARAMS)
> -			return -EINVAL;
> -
>  		/* Display qsets for all ports when offload enabled */
>  		if (test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) {
>  			q1 = 0;
> @@ -2306,8 +2301,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EBUSY;
>  		if (copy_from_user(&edata, useraddr, sizeof(edata)))
>  			return -EFAULT;
> -		if (edata.cmd != CHELSIO_SET_QSET_NUM)
> -			return -EINVAL;
>  		if (edata.val < 1 ||
>  			(edata.val > 1 && !(adapter->flags & USING_MSIX)))
>  			return -EINVAL;
> @@ -2348,8 +2341,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EPERM;
>  		if (copy_from_user(&t, useraddr, sizeof(t)))
>  			return -EFAULT;
> -		if (t.cmd != CHELSIO_LOAD_FW)
> -			return -EINVAL;
>  		/* Check t.len sanity ? */
>  		fw_data = memdup_user(useraddr + sizeof(t), t.len);
>  		if (IS_ERR(fw_data))
> @@ -2373,8 +2364,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EBUSY;
>  		if (copy_from_user(&m, useraddr, sizeof(m)))
>  			return -EFAULT;
> -		if (m.cmd != CHELSIO_SETMTUTAB)
> -			return -EINVAL;
>  		if (m.nmtus != NMTUS)
>  			return -EINVAL;
>  		if (m.mtus[0] < 81)	/* accommodate SACK */
> @@ -2416,8 +2405,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EBUSY;
>  		if (copy_from_user(&m, useraddr, sizeof(m)))
>  			return -EFAULT;
> -		if (m.cmd != CHELSIO_SET_PM)
> -			return -EINVAL;
>  		if (!is_power_of_2(m.rx_pg_sz) ||
>  			!is_power_of_2(m.tx_pg_sz))
>  			return -EINVAL;	/* not power of 2 */
> @@ -2453,8 +2440,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EIO;	/* need the memory controllers */
>  		if (copy_from_user(&t, useraddr, sizeof(t)))
>  			return -EFAULT;
> -		if (t.cmd != CHELSIO_GET_MEM)
> -			return -EINVAL;
>  		if ((t.addr & 7) || (t.len & 7))
>  			return -EINVAL;
>  		if (t.mem_id == MEM_CM)
> @@ -2507,8 +2492,6 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
>  			return -EAGAIN;
>  		if (copy_from_user(&t, useraddr, sizeof(t)))
>  			return -EFAULT;
> -		if (t.cmd != CHELSIO_SET_TRACE_FILTER)
> -			return -EINVAL;
>  
>  		tp = (const struct trace_params *)&t.sip;
>  		if (t.config_tx)
> -- 
> 2.31.1
> 

The original commit looks correct, dropping this revert.

greg k-h