netdev - Re: [PATCH] iwlwifi: trans: fix killer series loadded incorrect firmware

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <7b920ce3237faf87e57160a4c6727b87ec9bb1b0.camel@coelho.fi>
Date:   Tue, 14 May 2019 08:56:05 +0300
From:   Luca Coelho <luca@...lho.fi>
To:     Cyrus Lien <cyruslien@...il.com>,
        Johannes Berg <johannes.berg@...el.com>,
        Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
        Intel Linux Wireless <linuxwifi@...el.com>,
        Kalle Valo <kvalo@...eaurora.org>,
        "David S. Miller" <davem@...emloft.net>,
        Shahar S Matityahu <shahar.s.matityahu@...el.com>,
        Sara Sharon <sara.sharon@...el.com>,
        Golan Ben Ami <golan.ben.ami@...el.com>,
        Lior Cohen <lior2.cohen@...el.com>,
        Shaul Triebitz <shaul.triebitz@...el.com>,
        linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Cc:     Cyrus Lien <cyrus.lien@...onical.com>
Subject: Re: [PATCH] iwlwifi: trans: fix killer series loadded incorrect
 firmware

On Mon, 2019-05-13 at 21:33 +0800, Cyrus Lien wrote:
> Killer series loadded IWL_22000_HR_B_FW_PRE prefixed firmware instead
> IWL_CC_A_FW_PRE prefixed firmware.
> 
> Add killer series to the check logic as iwl_ax200_cfg_cc.
> 
> Signed-off-by: Cyrus Lien <cyrus.lien@...onical.com>
> ---
>  drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> index 79c1dc05f948..576c2186b6bf 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> @@ -3565,7 +3565,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct
> pci_dev *pdev,
>  		}
>  	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
>  		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
> -		   (trans->cfg != &iwl_ax200_cfg_cc ||
> +		   ((trans->cfg != &iwl_ax200_cfg_cc &&
> +		     trans->cfg != &killer1650x_2ax_cfg &&
> +		     trans->cfg != &killer1650w_2ax_cfg) ||
>  		    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
>  		u32 hw_status;
> 

Thanks for your patch, Cyrus! We already have an identical patch in our
internal tree and it will reach the mainline soon.

--
Cheers,
Luca.