Skip to contentSkip to conversation

Patch "net: hwbm: Fix unbalanced spinlock in error case" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jun 17, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

net: hwbm: Fix unbalanced spinlock in error case

to the 4.6-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-hwbm-fix-unbalanced-spinlock-in-error-case.patch
and it can be found in the queue-4.6 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 Fri Jun 17 08:34:39 PDT 2016

From: Gregory CLEMENT <[email protected]>
Date: Tue, 24 May 2016 18:03:26 +0200
Subject: net: hwbm: Fix unbalanced spinlock in error case

From: Gregory CLEMENT <[email protected]>

[ Upstream commit b388fc7405e901c7d6f7817d05193c054e761815 ]

When hwbm_pool_add exited in error the spinlock was not released. This patch fixes this issue.

Fixes 8cb2d8bf57e6 ("net: add a hardware buffer management helper API")
---
 net/core/hwbm.c |    3 +++
 1 file changed, 3 insertions(+)
net/core/hwbm.c +3 -0
@@ -55,18 +55,21 @@ int hwbm_pool_add(struct hwbm_pool *bm_p
 	spin_lock_irqsave(&bm_pool->lock, flags);
 	if (bm_pool->buf_num == bm_pool->size) {
 		pr_warn("pool already filled\n");
+		spin_unlock_irqrestore(&bm_pool->lock, flags);
 		return bm_pool->buf_num;
 	}
 
 	if (buf_num + bm_pool->buf_num > bm_pool->size) {
 		pr_warn("cannot allocate %d buffers for pool\n",
 			buf_num);
+		spin_unlock_irqrestore(&bm_pool->lock, flags);
 		return 0;
 	}
 
 	if ((buf_num + bm_pool->buf_num) < bm_pool->buf_num) {
 		pr_warn("Adding %d buffers to the %d current buffers will overflow\n",
 			buf_num,  bm_pool->buf_num);
+		spin_unlock_irqrestore(&bm_pool->lock, flags);
 		return 0;
 	}
 

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

queue-4.6/net-hwbm-fix-unbalanced-spinlock-in-error-case.patch queue-4.6/net-mvneta-fix-lacking-spinlock-initialization.patch