From patchwork Tue Mar 28 23:59:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9650725 X-Patchwork-Delegate: kvalo@adurom.com 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 D20CD6034B for ; Wed, 29 Mar 2017 00:00:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C74F02845D for ; Wed, 29 Mar 2017 00:00:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADA2C28304; Wed, 29 Mar 2017 00:00:02 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 3BEB728304 for ; Wed, 29 Mar 2017 00:00:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932666AbdC1X7k (ORCPT ); Tue, 28 Mar 2017 19:59:40 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:34415 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932623AbdC1X7j (ORCPT ); Tue, 28 Mar 2017 19:59:39 -0400 Received: by mail-pg0-f42.google.com with SMTP id 21so366993pgg.1 for ; Tue, 28 Mar 2017 16:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=DIeVVVbO9gPr3W73mKkRX07aLRijfNa3TH/dI3vL6EE=; b=TK+XkUlt8PBd/ZuzWYUTcyzCi/9+QtIJ7qNAjCOsuEVfPmmuPu5tb6+yRoa+SmgiUD saPiNHBDt9yg1qdZ2Ho60eDufxuKLVfYc3hDusCePbJk2Io7nkea+4UmqImaZUwre7P+ h80msUHpTQKDIOThSVS1An3w738uaXpCreEx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DIeVVVbO9gPr3W73mKkRX07aLRijfNa3TH/dI3vL6EE=; b=RvJCBNCQlpiii8CJ17TRua/TeuOm3D+pG6zvzwFrMYqLqxyIZBfGKdYzo/GBs4VzA4 AKMcNby4zyeBmqUc7FZBbVB1SQmnWYOVFOSn47oI1K+G1MS3nymiB42G3GDCtZFIRX1l 3oLdDoiDdmTp7yOn8RjQmg0/QJWGQZRKe5vP2o0YrlmqeeK7j25O9Xord2ZHJHT32Mpx WjtEYSghtU4y5e/3YwQ9Yz5+qf0rnxwq3p742r/5MWkzUkjcIhfvQhBwNsnI0AE3Rmlh jcghQqfTQFq5wUOJlV2+T3FnZlv6GlHjoaS4XVXZQyKU2fUJVFt0usVxF6TWBeo69Fa2 YMog== X-Gm-Message-State: AFeK/H2sM0n/rxRTnM6FMHa686LAZMEIx/vZFBVIjlCFJuDDo02MOB8RYfKBXZgmrU3XfR60 X-Received: by 10.84.254.75 with SMTP id a11mr22711931pln.57.1490745577802; Tue, 28 Mar 2017 16:59:37 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id 23sm9348757pfz.127.2017.03.28.16.59.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Mar 2017 16:59:37 -0700 (PDT) From: Brian Norris To: Amitkumar Karwar , Nishant Sarmukadam , Ganapathi Bhat , Xinming Hu Cc: , Kalle Valo , linux-wireless@vger.kernel.org, Brian Norris Subject: [PATCH 1/2] mwifiex: fix use-after-free for FW reinit errors Date: Tue, 28 Mar 2017 16:59:32 -0700 Message-Id: <20170328235933.950-1-briannorris@chromium.org> X-Mailer: git-send-email 2.12.2.564.g063fe858b8-goog Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If we fail to reinit the FW when resetting the device (in the synchronous version of mwifiex_init_hw_fw() -> mwifiex_fw_dpc()), mwifiex_fw_dpc() will tear down the interface and free up the adapter. But we don't actually check for all failure cases of mwifiex_fw_dpc(), so some of them fall through and dereference adapter->fw_done with a freed adapter, causing a use-after-free bug. In any case, mwifiex_fw_dpc() will always signal FW completion -- in the error OR success case -- so at best, this was repeat work. Let's not do it. Signed-off-by: Brian Norris --- drivers/net/wireless/marvell/mwifiex/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index 30f49944661f..98c83453ba5b 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -1475,7 +1475,6 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter) } mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__); - complete_all(adapter->fw_done); return 0; err_init_fw: