lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1464105806-439-3-git-send-email-gregory.clement@free-electrons.com> Date: Tue, 24 May 2016 18:03:26 +0200 From: Gregory CLEMENT <gregory.clement@...e-electrons.com> To: "David S. Miller" <davem@...emloft.net>, linux-kernel@...r.kernel.org, netdev@...r.kernel.org Cc: Russell King - ARM Linux <linux@....linux.org.uk>, Jean-Jacques Hiblot <jjhiblot@...phandler.com>, Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>, Lior Amsalem <alior@...vell.com>, Nadav Haklai <nadavh@...vell.com>, Marcin Wojtas <mw@...ihalf.com>, Gregory CLEMENT <gregory.clement@...e-electrons.com>, <stable@...r.kernel.org> Subject: [PATCH net 2/2] net: hwbm: Fix unbalanced spinlock in error case 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 <jjhiblot@...phandler.com> Cc: <stable@...r.kernel.org> Signed-off-by: Gregory CLEMENT <gregory.clement@...e-electrons.com> --- 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
Powered by blists - more mailing lists