Patch "sfc: pass valid pointers from efx_enqueue_unwind" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
sfc: pass valid pointers from efx_enqueue_unwind
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sfc-pass-valid-pointers-from-efx_enqueue_unwind.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Dec 31 11:12:48 CET 2017
From: Bert Kenward <[email protected]>
Date: Thu, 7 Dec 2017 17:18:58 +0000
Subject: sfc: pass valid pointers from efx_enqueue_unwind
From: Bert Kenward <[email protected]>
[ Upstream commit d4a7a8893d4cdbc89d79ac4aa704bf8d4b67b368 ]
The bytes_compl and pkts_compl pointers passed to efx_dequeue_buffers cannot be NULL. Add a paranoid warning to check this condition and fix the one case where they were NULL.
efx_enqueue_unwind() is called very rarely, during error handling. Without this fix it would fail with a NULL pointer dereference in efx_dequeue_buffer, with efx_enqueue_skb in the call stack.
--- drivers/net/ethernet/sfc/tx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/sfc/tx.c +4 -1
@@ -77,6 +77,7 @@ static void efx_dequeue_buffer(struct ef }if (buffer->flags &EFX_TX_BUF_SKB ) { +EFX_WARN_ON_PARANOID (!pkts_compl || !bytes_compl); (*pkts_compl)++; (*bytes_compl) += buffer->skb->len;dev_consume_skb_any ((struct sk_buff *)buffer->skb);
@@ -426,12 +427,14 @@ static int efx_tx_map_data(struct efx_txstatic void efx_enqueue_unwind (struct efx_tx_queue *tx_queue) {struct efx_tx_buffer *buffer; +unsigned int bytes_compl =0 ; +unsigned int pkts_compl =0 ;/* Work backwards until we hit the original insert pointer value */ while (tx_queue->insert_count != tx_queue->write_count) { --tx_queue->insert_count; buffer =__efx_tx_queue_get_insert_buffer (tx_queue); -efx_dequeue_buffer (tx_queue, buffer,NULL ,NULL ); +efx_dequeue_buffer (tx_queue, buffer, &pkts_compl, &bytes_compl); } }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/sfc-pass-valid-pointers-from-efx_enqueue_unwind.patch