Re: [PATCH 129/190] Revert "qlcnic: Avoid potential NULL pointer dereference"

Greg Kroah-Hartman
2021-04-27T17:08:39Z

On Wed, Apr 21, 2021 at 03:00:04PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 5bf7295fe34a5251b1d241b9736af4697b590670.
>
> 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: Aditya Pakki <pakki001@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
> index d8a3ecaed3fc..985cf8cb2ec0 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
> @@ -1047,8 +1047,6 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)
>
> for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) {
> skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE);
> - if (!skb)
> - break;
> qlcnic_create_loopback_buff(skb->data, adapter->mac_addr);
> skb_put(skb, QLCNIC_ILB_PKT_SIZE);
> adapter->ahw->diag_cnt = 0;
> --
> 2.31.1
>

This commit does not properly detect if an error happens because the
logic after this loop will not detect that there was a failed
allocation. I will keep this revert and fix it up properly later.

thanks,

greg k-h