From patchwork Fri Jul 6 13:10:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 10511689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BB0C16024A for ; Fri, 6 Jul 2018 13:10:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA00328622 for ; Fri, 6 Jul 2018 13:10:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A785E285DC; Fri, 6 Jul 2018 13:10:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 811D9286B6 for ; Fri, 6 Jul 2018 13:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933026AbeGFNKr (ORCPT ); Fri, 6 Jul 2018 09:10:47 -0400 Received: from gateway21.websitewelcome.com ([192.185.45.89]:34039 "EHLO gateway21.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932665AbeGFNKr (ORCPT ); Fri, 6 Jul 2018 09:10:47 -0400 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 67F94400C5F75 for ; Fri, 6 Jul 2018 08:10:46 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id bQVafRWMHaSeybQVaf5XvM; Fri, 06 Jul 2018 08:10:46 -0500 X-Authority-Reason: nr=8 Received: from [189.250.65.56] (port=40042 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1fbQVZ-004J9U-Th; Fri, 06 Jul 2018 08:10:46 -0500 Date: Fri, 6 Jul 2018 08:10:44 -0500 From: "Gustavo A. R. Silva" To: Matthew Wilcox Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] xarray: Fix lock/unlock imbalance in xa_alloc Message-ID: <20180706131044.GA25469@embeddedor.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.65.56 X-Source-L: No X-Exim-ID: 1fbQVZ-004J9U-Th X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.65.56]:40042 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 2 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Release *xa_lock* before return. Addresses-Coverity-ID: 1471631 ("Missing unlock") Fixes: 29a6bfc32eb2 ("xarray: Track free entries in an XArray") Signed-off-by: Gustavo A. R. Silva --- lib/xarray.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/xarray.c b/lib/xarray.c index be10039..a27fdb38 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1474,8 +1474,10 @@ int xa_alloc(struct xarray *xa, u32 *id, void *entry, gfp_t gfp) xas.xa_index = 0; xas_lock(&xas); xas_find_tagged(&xas, UINT_MAX, XA_FREE_TAG); - if (xas.xa_node == XAS_BOUNDS && xas.xa_index == UINT_MAX + 1) + if (xas.xa_node == XAS_BOUNDS && xas.xa_index == UINT_MAX + 1) { + xas_unlock(&xas); return -ENOSPC; + } *id = xas.xa_index; xas_store(&xas, entry); xas_clear_tag(&xas, XA_FREE_TAG);