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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 62366C04E53 for ; Wed, 15 May 2019 11:15:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34AA020644 for ; Wed, 15 May 2019 11:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918931; bh=7mdAG++hHPV5dcH9i80MCr5GlBNWq0L2PV9ChcBDkYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z9yOgLgKF5RtJVitEw/Fm9rX8ysKmXjoZboSGCuBqruyDnU36RfwrYCz70/j8/wpx 8PKtz9tQovOazW2+o/UpmNvGUeew9zWj6b9OwRKPB2hPdMnuWWFsFNxtxKfM1V7+Y5 RMeG9P9d2Ql/ruqZtXkxgIslNZWqVfFjYvbf91r0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730300AbfEOLP3 (ORCPT ); Wed, 15 May 2019 07:15:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:51978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730261AbfEOLP2 (ORCPT ); Wed, 15 May 2019 07:15:28 -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 AE6C820644; Wed, 15 May 2019 11:15:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918928; bh=7mdAG++hHPV5dcH9i80MCr5GlBNWq0L2PV9ChcBDkYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JrotjxiXwvzh93xygsTE1H6wnsaGhcIlG4ncZmZU7WTweUbUPptLwqhaLZzAKOB0J tWToDW4GoGWk7Wa1Se4SfR7Vt8EwMLzBqmO4nFj6I4ctGZm/kynebWGQ+brh+uZQzK kp/jThBIIawpVcgX0mNVj/OXbyQZCFp2s/XdQ5tI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Jia-Ju Bai , Kalle Valo Subject: [PATCH 4.9 30/51] cw1200: fix missing unlock on error in cw1200_hw_scan() Date: Wed, 15 May 2019 12:56:05 +0200 Message-Id: <20190515090625.639425719@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090616.669619870@linuxfoundation.org> References: <20190515090616.669619870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Yongjun commit 51c8d24101c79ffce3e79137e2cee5dfeb956dd7 upstream. Add the missing unlock before return from function cw1200_hw_scan() in the error handling case. Fixes: 4f68ef64cd7f ("cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()") Signed-off-by: Wei Yongjun Acked-by: Jia-Ju Bai Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/st/cw1200/scan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/st/cw1200/scan.c +++ b/drivers/net/wireless/st/cw1200/scan.c @@ -84,8 +84,11 @@ int cw1200_hw_scan(struct ieee80211_hw * frame.skb = ieee80211_probereq_get(hw, priv->vif->addr, NULL, 0, req->ie_len); - if (!frame.skb) + if (!frame.skb) { + mutex_unlock(&priv->conf_mutex); + up(&priv->scan.lock); return -ENOMEM; + } if (req->ie_len) memcpy(skb_put(frame.skb, req->ie_len), req->ie, req->ie_len);