Re: [PATCH 180/190] Revert "net: socket: fix a missing-check bug"

Greg Kroah-Hartman
2021-04-27T16:58:38Z

On Wed, Apr 21, 2021 at 03:00:55PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit b6168562c8ce2bd5a30e213021650422e08764dc.
>
> 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>
> ---
> net/socket.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/net/socket.c b/net/socket.c
> index 84a8049c2b09..d4176362a27b 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -3182,14 +3182,9 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
> copy_in_user(&rxnfc->fs.ring_cookie,
> &compat_rxnfc->fs.ring_cookie,
> (void __user *)(&rxnfc->fs.location + 1) -
> - (void __user *)&rxnfc->fs.ring_cookie))
> - return -EFAULT;
> - if (ethcmd == ETHTOOL_GRXCLSRLALL) {
> - if (put_user(rule_cnt, &rxnfc->rule_cnt))
> - return -EFAULT;
> - } else if (copy_in_user(&rxnfc->rule_cnt,
> - &compat_rxnfc->rule_cnt,
> - sizeof(rxnfc->rule_cnt)))
> + (void __user *)&rxnfc->fs.ring_cookie) ||
> + copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
> + sizeof(rxnfc->rule_cnt)))
> return -EFAULT;
> }
>
> --
> 2.31.1
>

Original looks correct, dropping this revert.

greg k-h