From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 102DBC33CB6 for ; Thu, 16 Jan 2020 17:23:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8E4824683 for ; Thu, 16 Jan 2020 17:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195432; bh=2cau1KIjwdkpTD9nT1zF1o98NKiqC//O1dSTLO6FqFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ot7ZQ2AIjeNvq1RnYIqQ+O9yqGl/bxz+HKpopFs/ZulnFexJ4GNOtcJVAdgVs9xKo 7RY5rPaV5rjoo5h2T3vYH5cGpah7df1JUmP61bnEpJDKGw4Tt0LkIE6dbuqKVlHc4Z PtTJtdoYe6Kdhkor0d6IGzEaXu8kUJmYMTC+jbdA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729519AbgAPRXp (ORCPT ); Thu, 16 Jan 2020 12:23:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:57476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390663AbgAPRNK (ORCPT ); Thu, 16 Jan 2020 12:13:10 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C02D02469D; Thu, 16 Jan 2020 17:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194789; bh=2cau1KIjwdkpTD9nT1zF1o98NKiqC//O1dSTLO6FqFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TXC2rp+eNJRV8TVQxzeOpdjmEgwIy6xifPeTUKl1J5r8nLpOLEiDK9KOVbOA2bNzH pw3TkU8LCoep12yYC/8vxFVY0AetD4Vg1NhsajfgZS//s8yVo6nqejJD+yYM33wsif asVOD3EO9PCmfrlGGbLMlGI7N1FqhNBsJQLl13mI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Daniel Borkmann , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 603/671] bpf, offload: Unlock on error in bpf_offload_dev_create() Date: Thu, 16 Jan 2020 12:04:01 -0500 Message-Id: <20200116170509.12787-340-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Dan Carpenter [ Upstream commit d0fbb51dfaa612f960519b798387be436e8f83c5 ] We need to drop the bpf_devs_lock on error before returning. Fixes: 9fd7c5559165 ("bpf: offload: aggregate offloads per-device") Signed-off-by: Dan Carpenter Signed-off-by: Daniel Borkmann Acked-by: Jakub Kicinski Link: https://lore.kernel.org/bpf/20191104091536.GB31509@mwanda Signed-off-by: Sasha Levin --- kernel/bpf/offload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 177a52436394..86477f3894e5 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -645,8 +645,10 @@ struct bpf_offload_dev *bpf_offload_dev_create(void) down_write(&bpf_devs_lock); if (!offdevs_inited) { err = rhashtable_init(&offdevs, &offdevs_params); - if (err) + if (err) { + up_write(&bpf_devs_lock); return ERR_PTR(err); + } offdevs_inited = true; } up_write(&bpf_devs_lock); -- 2.20.1