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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 83248C742B9 for ; Fri, 12 Jul 2019 12:20:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C34A21019 for ; Fri, 12 Jul 2019 12:20:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934004; bh=DAy3AS84oplkc2aTGVWtMiCaPAZTnNDDmFazPsBklFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Nh5QuhOCjsOKhPfnv7JjgGjGT5KgjDIJpF4v8Lf1p3vb9RUmqb/6f1OyNjeNmYUtY 7rVX1X7JoH+gN7jMFw6QQz9O2WTWBtHKQiSQFbz4O1MRMhmFkmtqbiHlgVbZD515Sp SmZXxKDYpnCLHu3FctQBqNKwIDQCWw2su9EQIaDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727196AbfGLMUD (ORCPT ); Fri, 12 Jul 2019 08:20:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:53008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbfGLMUC (ORCPT ); Fri, 12 Jul 2019 08:20:02 -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 9A0F121019; Fri, 12 Jul 2019 12:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934002; bh=DAy3AS84oplkc2aTGVWtMiCaPAZTnNDDmFazPsBklFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBI7yrETH3z9Nh8qBP8wx0/af+gPU9KxVQ4gJy7hx27BGKja2u3w/XVeC7ArHm6zu 27ivoIOCx4XjuyaJduWw4tYGLVUZPkTaXl0GFq9zRsvJdob72McvVzMcmKPD3xm06W Iib9byIzXK/iHK+Ik1/3Mjj5fxz02AoULsiWzgzY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jia-Ju Bai , Luca Coelho , Kalle Valo , Sasha Levin Subject: [PATCH 4.19 15/91] iwlwifi: Fix double-free problems in iwl_req_fw_callback() Date: Fri, 12 Jul 2019 14:18:18 +0200 Message-Id: <20190712121622.219875809@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121621.422224300@linuxfoundation.org> References: <20190712121621.422224300@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 [ Upstream commit a8627176b0de7ba3f4524f641ddff4abf23ae4e4 ] In the error handling code of iwl_req_fw_callback(), iwl_dealloc_ucode() is called to free data. In iwl_drv_stop(), iwl_dealloc_ucode() is called again, which can cause double-free problems. To fix this bug, the call to iwl_dealloc_ucode() in iwl_req_fw_callback() is deleted. This bug is found by a runtime fuzzing tool named FIZZER written by us. Signed-off-by: Jia-Ju Bai Signed-off-by: Luca Coelho Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index c0631255aee7..db6628d390a2 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1547,7 +1547,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) goto free; out_free_fw: - iwl_dealloc_ucode(drv); release_firmware(ucode_raw); out_unbind: complete(&drv->request_firmware_complete); -- 2.20.1