lkml.org 
[lkml]   [2021]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 137/190] Revert "net: lio_core: fix two NULL pointer dereferences"
On Wed, Apr 21, 2021 at 03:00:12PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 41af8b3a097c6fd17a4867efa25966927094f57c.
>
> 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>
> ---
> drivers/net/ethernet/cavium/liquidio/lio_core.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c
> index 2a0d64e5797c..3532730eb936 100644
> --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c
> +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c
> @@ -1211,11 +1211,6 @@ int liquidio_change_mtu(struct net_device *netdev, int new_mtu)
>
> sc = (struct octeon_soft_command *)
> octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, 16, 0);
> - if (!sc) {
> - netif_info(lio, rx_err, lio->netdev,
> - "Failed to allocate soft command\n");
> - return -ENOMEM;
> - }
>
> ncmd = (union octnet_cmd *)sc->virtdptr;
>
> @@ -1689,11 +1684,6 @@ int liquidio_set_fec(struct lio *lio, int on_off)
>
> sc = octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,
> sizeof(struct oct_nic_seapi_resp), 0);
> - if (!sc) {
> - dev_err(&oct->pci_dev->dev,
> - "Failed to allocate soft command\n");
> - return -ENOMEM;
> - }
>
> ncmd = sc->virtdptr;
> resp = sc->virtrptr;
> --
> 2.31.1
>

Original here looks correct, I'll drop my revert.

greg k-h

\
 
 \ /
  Last update: 2021-04-27 20:18    [W:1.894 / U:0.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site