Skip to content

Commit 4fd798a

Browse files
committed
Revert "net: liquidio: fix a NULL pointer dereference"
This reverts commit fe543b2. 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. While the original commit does keep the immediate "NULL dereference" from happening, it does not properly propagate the error back to the callers, AND it does not fix this same identical issue in the drivers/net/ethernet/cavium/liquidio/lio_vf_main.c for some reason. Cc: Kangjie Lu <[email protected]> Cc: David S. Miller <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent dacb408 commit 4fd798a

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

drivers/net/ethernet/cavium/liquidio/lio_main.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,11 +1166,6 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
11661166
sc = (struct octeon_soft_command *)
11671167
octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,
11681168
16, 0);
1169-
if (!sc) {
1170-
netif_info(lio, rx_err, lio->netdev,
1171-
"Failed to allocate octeon_soft_command\n");
1172-
return;
1173-
}
11741169

11751170
ncmd = (union octnet_cmd *)sc->virtdptr;
11761171

0 commit comments

Comments
 (0)