Patch "net: dp83640: fix improper double spin locking." has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

net: dp83640: fix improper double spin locking.

to the 4.0-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:
net-dp83640-fix-improper-double-spin-locking.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Richard Cochran <[email protected]>
Date: Mon, 25 May 2015 11:55:45 +0200
Subject: net: dp83640: fix improper double spin locking.

From: Richard Cochran <[email protected]>

[ Upstream commit adbe088f6f8b0b7701fe07f51fe6f2bd602a6665 ]

A pair of nested spin locks was introduced in commit 63502b8d0 "dp83640: Fix receive timestamp race condition".

Unfortunately the 'flags' parameter was reused for the inner lock, clobbering the originally saved IRQ state. This patch fixes the issue by changing the inner lock to plain spin_lock without irqsave.

---
 drivers/net/phy/dp83640.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -845,7 +845,7 @@ static void decode_rxts(struct dp83640_p
 	list_del_init(&rxts->list);
 	phy2rxts(phy_rxts, rxts);
 
-	spin_lock_irqsave(&dp83640->rx_queue.lock, flags);
+	spin_lock(&dp83640->rx_queue.lock);
 	skb_queue_walk(&dp83640->rx_queue, skb) {
 		struct dp83640_skb_info *skb_info;
 

@@ -860,7 +860,7 @@ static void decode_rxts(struct dp83640_p
 			break;
 		}
 	}
-	spin_unlock_irqrestore(&dp83640->rx_queue.lock, flags);
+	spin_unlock(&dp83640->rx_queue.lock);
 
 	if (!shhwtstamps)
 		list_add_tail(&rxts->list, &dp83640->rxts);

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/net-dp83640-fix-improper-double-spin-locking.patch queue-4.0/net-dp83640-reinforce-locking-rules.patch queue-4.0/net-dp83640-fix-broken-calibration-routine.patch