From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from down.free-electrons.com ([37.187.137.238]:41794 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752768AbcEXQEH (ORCPT ); Tue, 24 May 2016 12:04:07 -0400 From: Gregory CLEMENT To: "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Russell King - ARM Linux , Jean-Jacques Hiblot , Thomas Petazzoni , Lior Amsalem , Nadav Haklai , Marcin Wojtas , Gregory CLEMENT , Subject: [PATCH net 2/2] net: hwbm: Fix unbalanced spinlock in error case Date: Tue, 24 May 2016 18:03:26 +0200 Message-Id: <1464105806-439-3-git-send-email-gregory.clement@free-electrons.com> In-Reply-To: <1464105806-439-1-git-send-email-gregory.clement@free-electrons.com> References: <1464105806-439-1-git-send-email-gregory.clement@free-electrons.com> Sender: stable-owner@vger.kernel.org List-ID: 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") Reported-by: Jean-Jacques Hiblot Cc: Signed-off-by: Gregory CLEMENT --- net/core/hwbm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/hwbm.c b/net/core/hwbm.c index 941c28486896..2cab489ae62e 100644 --- a/net/core/hwbm.c +++ b/net/core/hwbm.c @@ -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); 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; } -- 2.5.0