linux-kernel - [PATCH 2/2] iwlwifi: fix DVM boot regression in 5.12-rc

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LSU.2.11.2103061147270.1285@eggly.anvils>
Date:   Sat, 6 Mar 2021 11:49:13 -0800 (PST)
From:   Hugh Dickins <hughd@...gle.com>
To:     Luca Coelho <luciano.coelho@...el.com>
cc:     Kalle Valo <kvalo@...eaurora.org>,
        Mordechay Goodstein <mordechay.goodstein@...el.com>,
        Jiri Kosina <jikos@...nel.org>,
        Hugh Dickins <hughd@...gle.com>,
        linux-wireless@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] iwlwifi: fix DVM boot regression in 5.12-rc

No time_point op has been provided for DVM: check for NULL before
calling, to fix the oops (blank screen booting non-modular kernel).

Fixes: d01293154c0a ("iwlwifi: dbg: add op_mode callback for collecting debug data.")
Signed-off-by: Hugh Dickins <hughd@...gle.com>
---

 drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h	2021-02-28 16:58:55.058425551 -0800
+++ linux/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h	2021-03-05 20:59:14.156217412 -0800
@@ -205,7 +205,8 @@ static inline void iwl_op_mode_time_poin
 					  enum iwl_fw_ini_time_point tp_id,
 					  union iwl_dbg_tlv_tp_data *tp_data)
 {
-	op_mode->ops->time_point(op_mode, tp_id, tp_data);
+	if (op_mode->ops->time_point)
+		op_mode->ops->time_point(op_mode, tp_id, tp_data);
 }
 
 #endif /* __iwl_op_mode_h__ */