Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: hwbm: Fix unbalanced spinlock in error case

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

Fixes: 8cb2d8bf57 ("net: add a hardware buffer management helper API")
Reported-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gregory CLEMENT 2016-05-24 18:03:26 +02:00 committed by David S. Miller
parent 91c45e38b9
commit b388fc7405
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/core/hwbm.c
View file

@ -55,18 +55,21 @@ int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num, gfp_t gfp)
spin_lock_irqsave(&bm_pool->lock, flags); spin_lock_irqsave(&bm_pool->lock, flags);
if (bm_pool->buf_num == bm_pool->size) { if (bm_pool->buf_num == bm_pool->size) {
pr_warn("pool already filled\n"); pr_warn("pool already filled\n");
spin_unlock_irqrestore(&bm_pool->lock, flags);
return bm_pool->buf_num; return bm_pool->buf_num;
} }
if (buf_num + bm_pool->buf_num > bm_pool->size) { if (buf_num + bm_pool->buf_num > bm_pool->size) {
pr_warn("cannot allocate %d buffers for pool\n", pr_warn("cannot allocate %d buffers for pool\n",
buf_num); buf_num);
spin_unlock_irqrestore(&bm_pool->lock, flags);
return 0; return 0;
} }
if ((buf_num + bm_pool->buf_num) < bm_pool->buf_num) { if ((buf_num + bm_pool->buf_num) < bm_pool->buf_num) {
pr_warn("Adding %d buffers to the %d current buffers will overflow\n", pr_warn("Adding %d buffers to the %d current buffers will overflow\n",
buf_num, bm_pool->buf_num); buf_num, bm_pool->buf_num);
spin_unlock_irqrestore(&bm_pool->lock, flags);
return 0; return 0;
} }