From patchwork Thu Mar 17 09:52:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 8609021 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EDB4C9F6E1 for ; Thu, 17 Mar 2016 09:50:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F2CA2026C for ; Thu, 17 Mar 2016 09:50:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E1A5201CD for ; Thu, 17 Mar 2016 09:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935488AbcCQJuJ (ORCPT ); Thu, 17 Mar 2016 05:50:09 -0400 Received: from mail-lf0-f54.google.com ([209.85.215.54]:35990 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935294AbcCQJuG (ORCPT ); Thu, 17 Mar 2016 05:50:06 -0400 Received: by mail-lf0-f54.google.com with SMTP id l83so38578325lfd.3 for ; Thu, 17 Mar 2016 02:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=KrWU89oOwCFH4MUMWdQqtumx/IN8FyI0Ni6/i3AOSEg=; b=Bn/gQAea6rX9zCh2Lh3Yr78r+rCpuxDIpsILXoD1IzqV4XSDt+oh8CAgdPZs2XvJKk k8kDB7pGR36Enegm6yE7Dcm5wUyuN+1dKvM8B6+bEUE4ISPRmbyRNA4K9bhucA6iXlzP oeA9khvnFkms3PjZ4c5Yewm8vLfoIOp6Bwr7E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KrWU89oOwCFH4MUMWdQqtumx/IN8FyI0Ni6/i3AOSEg=; b=J41DnJp4Ut7XgBWnoLEhFdjYN+04QHOoWD1yN37nAygzZSR8nS0T2DKoMXzRoOYtzK u8e9Vv3NY16rjCj9kpTXrJIcIseUCQQkH929qK4a2tbTqpwBg4oJ2sifWuKeY8W96CBs NU/yvQK6b5vuSyq3qH4IKeHdS0UL8CVwkmk+QP39MpC3geJIaUTYjHgmmG9eruZoIoEa h76DWqp71lA3Gmg/yiDojttJo+qsgioU+TVGI0VowFX84yqzBkBEh8X1jtb7cI2l9C4m C4iMVI+cMUFohnYfK7Joi0sIV3FZSlxdvRfaJvKQEovIfgiEYBDe/p7a/7Zf9zT+EN7V EBFw== X-Gm-Message-State: AD7BkJLViysgs6LrwvtSw1ARv+E2S1xhhlk1TAD8QNL98wcViwkIwmNCbbvb4JJTJS/qlEQgZ8fglOzbHBrISTGtflzyrrd8X++/HYxuBJaUushEEPbFfBJ0xtfh1yti8igX8SUhcNtf6Q== X-Received: by 10.25.138.7 with SMTP id m7mr3369736lfd.109.1458208199165; Thu, 17 Mar 2016 02:49:59 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id h192sm1279109lfb.45.2016.03.17.02.49.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 02:49:58 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH] ath10k: fix null deref if device crashes early Date: Thu, 17 Mar 2016 10:52:08 +0100 Message-Id: <1458208328-16827-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If device failed to init during early probing (which is quite rare) it triggered driver to compute crc before ar->firmware was ready causing an oops. Fixes: 3e58044b61a9 ("ath10k: print crc32 checksums for firmware and board files") Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/debug.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 076d29b53ddf..5587f167bcdc 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -127,6 +127,7 @@ EXPORT_SYMBOL(ath10k_info); void ath10k_debug_print_hwfw_info(struct ath10k *ar) { char fw_features[128] = {}; + u32 crc = 0; ath10k_core_get_fw_features_str(ar, fw_features, sizeof(fw_features)); @@ -143,11 +144,14 @@ void ath10k_debug_print_hwfw_info(struct ath10k *ar) config_enabled(CONFIG_ATH10K_DFS_CERTIFIED), config_enabled(CONFIG_NL80211_TESTMODE)); + if (ar->firmware) + crc = crc32_le(0, ar->firmware->data, ar->firmware->size); + ath10k_info(ar, "firmware ver %s api %d features %s crc32 %08x\n", ar->hw->wiphy->fw_version, ar->fw_api, fw_features, - crc32_le(0, ar->firmware->data, ar->firmware->size)); + crc); } void ath10k_debug_print_board_info(struct ath10k *ar)