| From b95b57dfe7a142bf2446548eb7f49340fd73e78b Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Mon, 3 May 2021 13:56:51 +0200 |
| Subject: Revert "qlcnic: Avoid potential NULL pointer dereference" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| commit b95b57dfe7a142bf2446548eb7f49340fd73e78b upstream. |
| |
| This reverts commit 5bf7295fe34a5251b1d241b9736af4697b590670. |
| |
| Because of recent interactions with developers from @umn.edu, all |
| commits from them have been recently re-reviewed to ensure if they were |
| correct or not. |
| |
| Upon review, this commit was found to be incorrect for the reasons |
| below, so it must be reverted. It will be fixed up "correctly" in a |
| later kernel change. |
| |
| 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. |
| |
| Cc: Aditya Pakki <pakki001@umn.edu> |
| Cc: David S. Miller <davem@davemloft.net> |
| Fixes: 5bf7295fe34a ("qlcnic: Avoid potential NULL pointer dereference") |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20210503115736.2104747-25-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c |
| +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c |
| @@ -1038,8 +1038,6 @@ int qlcnic_do_lb_test(struct qlcnic_adap |
| |
| 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; |
