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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 ACCB8C433E5 for ; Mon, 27 Jul 2020 14:15:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E4922078E for ; Mon, 27 Jul 2020 14:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859308; bh=fdJBcHhe5Y0lEAqNrc+DepWq3JAQJpBhn8tEIoaSXVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ETIraOO5RwZIR9c5PEapnL4y8aXKx1RyZvJHa3dVzXr8wSHb7+zv1s/WAUzhT3UMB u4lrZWDhungzs5D29L8cm7IJpo95P08AtJ/UM2SGhHZ8azOCdGIm7SthEyPnTFpif3 73Wez2ocSkXm9+h3GCWO9mJlFIf7hd4imRTWxwZ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730658AbgG0OPH (ORCPT ); Mon, 27 Jul 2020 10:15:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:41198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730646AbgG0OPF (ORCPT ); Mon, 27 Jul 2020 10:15:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5FB442078E; Mon, 27 Jul 2020 14:15:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859304; bh=fdJBcHhe5Y0lEAqNrc+DepWq3JAQJpBhn8tEIoaSXVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DTQpkrB4W8hgLkZMqrRH6+SGNSDANbDYMyynwTPzmnb/8TPpDDB3Yv0atzigc61Ql Y1aRHLP/z5llmx2gE7rOjyt7daJBV1r455k0WxLlLr1f4h88fdcgR084MsKc7dyBJe 3OHp4OP0PmgNg3VXEqzBtm78hFWicj3mQx8CxqAI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Taehee Yoo , Jakub Kicinski , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 056/138] netdevsim: fix unbalaced locking in nsim_create() Date: Mon, 27 Jul 2020 16:04:11 +0200 Message-Id: <20200727134928.210346069@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134925.228313570@linuxfoundation.org> References: <20200727134925.228313570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Taehee Yoo [ Upstream commit 2c9d8e01f0c6017317eee7638496173d4a64e6bc ] In the nsim_create(), rtnl_lock() is called before nsim_bpf_init(). If nsim_bpf_init() is failed, rtnl_unlock() should be called, but it isn't called. So, unbalanced locking would occur. Fixes: e05b2d141fef ("netdevsim: move netdev creation/destruction to dev probe") Signed-off-by: Taehee Yoo Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/netdevsim/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 55f57f76d01bb..a6bbe93f29ef6 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -301,7 +301,7 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) rtnl_lock(); err = nsim_bpf_init(ns); if (err) - goto err_free_netdev; + goto err_rtnl_unlock; nsim_ipsec_init(ns); @@ -315,8 +315,8 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) err_ipsec_teardown: nsim_ipsec_teardown(ns); nsim_bpf_uninit(ns); +err_rtnl_unlock: rtnl_unlock(); -err_free_netdev: free_netdev(dev); return ERR_PTR(err); } -- 2.25.1