Re: [PATCH 136/190] Revert "net: thunder: fix a potential NULL pointer dereference"

Josh Poimboeuf
2021-04-23T13:00:17Z

On Wed, Apr 21, 2021 at 03:00:11PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 0b31d98d90f09868dce71319615e19cd1f146fb6.
>
> 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: Kangjie Lu <kjlu@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+Cc: Sunil Goutham <sgoutham@marvell.com>

The original patch looks correct to me.

> ---
> drivers/net/ethernet/cavium/thunder/nicvf_main.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
> index c33b4e837515..b10608c55db0 100644
> --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
> +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
> @@ -2246,12 +2246,6 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> nic->nicvf_rx_mode_wq = alloc_ordered_workqueue("nicvf_rx_mode_wq_VF%d",
> WQ_MEM_RECLAIM,
> nic->vf_id);
> - if (!nic->nicvf_rx_mode_wq) {
> - err = -ENOMEM;
> - dev_err(dev, "Failed to allocate work queue\n");
> - goto err_unregister_interrupts;
> - }
> -
> INIT_WORK(&nic->rx_mode_work.work, nicvf_set_rx_mode_task);
> spin_lock_init(&nic->rx_mode_wq_lock);
>
> --
> 2.31.1
>

--
Josh