From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41850 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751804AbdEIJUv (ORCPT ); Tue, 9 May 2017 05:20:51 -0400 Subject: Patch "iwlwifi: mvm: properly check for transport data in dump" has been added to the 4.10-stable tree To: johannes.berg@intel.com, gregkh@linuxfoundation.org, luciano.coelho@intel.com Cc: , From: Date: Tue, 09 May 2017 11:19:45 +0200 Message-ID: <149432158569163@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled iwlwifi: mvm: properly check for transport data in dump to the 4.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: iwlwifi-mvm-properly-check-for-transport-data-in-dump.patch and it can be found in the queue-4.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From c2e27e16f2411155b906db201b7e478144034ffe Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 20 Oct 2016 15:25:00 +0200 Subject: iwlwifi: mvm: properly check for transport data in dump From: Johannes Berg commit c2e27e16f2411155b906db201b7e478144034ffe upstream. When copying from vmalloc'ed memory to the SG list, don't crash if the transport didn't provide any data. Fixes: 7e62a699aafb ("iwlwifi: mvm: use dev_coredumpsg()") Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c @@ -816,11 +816,12 @@ dump_trans_data: sg_nents(sg_dump_data), fw_error_dump->op_mode_ptr, fw_error_dump->op_mode_len, 0); - sg_pcopy_from_buffer(sg_dump_data, - sg_nents(sg_dump_data), - fw_error_dump->trans_ptr->data, - fw_error_dump->trans_ptr->len, - fw_error_dump->op_mode_len); + if (fw_error_dump->trans_ptr) + sg_pcopy_from_buffer(sg_dump_data, + sg_nents(sg_dump_data), + fw_error_dump->trans_ptr->data, + fw_error_dump->trans_ptr->len, + fw_error_dump->op_mode_len); dev_coredumpsg(mvm->trans->dev, sg_dump_data, file_len, GFP_KERNEL); } Patches currently in stable-queue which might be from johannes.berg@intel.com are queue-4.10/iwlwifi-mvm-properly-check-for-transport-data-in-dump.patch queue-4.10/iwlwifi-mvm-overwrite-skb-info-later.patch queue-4.10/iwlwifi-mvm-pcie-adjust-a-msdu-tx_cmd-length-in-pcie.patch