lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 387/717] iwlwifi: dbg-tlv: fix old length in is_trig_data_contained()
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 58a1c9f9a9b6b9092ae10b84f6b571a06596e296 ]

    There's a bug in the lengths - the 'old length' needs to be calculated
    using the 'old' pointer, of course, likely a copy/paste mistake. Fix
    this.

    Reported-by: Daniel Gabay <daniel.gabay@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Fixes: cf29c5b66b9f ("iwlwifi: dbg_ini: implement time point handling")
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20201209231352.c0105ddffa74.I1ddb243053ff763c91b663748b6a593ecc3b5634@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
    index 51ce93d21ffe5..8fa1c22fd96db 100644
    --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
    @@ -808,7 +808,7 @@ static bool is_trig_data_contained(struct iwl_ucode_tlv *new,
    struct iwl_fw_ini_trigger_tlv *old_trig = (void *)old->data;
    __le32 *new_data = new_trig->data, *old_data = old_trig->data;
    u32 new_dwords_num = iwl_tlv_array_len(new, new_trig, data);
    - u32 old_dwords_num = iwl_tlv_array_len(new, new_trig, data);
    + u32 old_dwords_num = iwl_tlv_array_len(old, old_trig, data);
    int i, j;

    for (i = 0; i < new_dwords_num; i++) {
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:2.945 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site