Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78a55d05 authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by David S. Miller
Browse files

net: ena: fix NULL dereference due to untimely napi initialization 



napi poll functions should be initialized before running request_irq(),
to handle a rare condition where there is a pending interrupt, causing
the ISR to fire immediately while the poll function wasn't set yet,
causing a NULL dereference.

Fixes: 1738cd3e ("net: ena: Add a driver for Amazon Elastic Network Adapters (ENA)")
Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7703ddb

drivers/net/ethernet/amazon/ena/ena_netdev.c

+7 −2
Original line number Diff line number Diff line
@@ -1575,8 +1575,6 @@ static int ena_up_complete(struct ena_adapter *adapter) 
	if (rc)

		return rc;



	ena_init_napi(adapter);



	ena_change_mtu(adapter->netdev, adapter->netdev->mtu);



	ena_refill_all_rx_bufs(adapter);
@@ -1730,6 +1728,13 @@ static int ena_up(struct ena_adapter *adapter) 


	ena_setup_io_intr(adapter);



	/* napi poll functions should be initialized before running

	 * request_irq(), to handle a rare condition where there is a pending

	 * interrupt, causing the ISR to fire immediately while the poll

	 * function wasn't set yet, causing a null dereference

	 */

	ena_init_napi(adapter);



	rc = ena_request_io_irq(adapter);

	if (rc)

		goto err_req_irq;