From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15723C432C3 for ; Tue, 19 Nov 2019 05:27:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D02CF222A2 for ; Tue, 19 Nov 2019 05:27:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141261; bh=UuQWW+L4IQqGuH0JRhMtWTxzuWW1bEjd2yHLLq7S33Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zKJJ5BxiiTW+eOacRkzjxfkq7vnPCBCXkEdfvicMdhgx8U5J6WGZJhZ2V2pUwuFPP D9NT2wN5tM2h76m1btoN9SPon44NjBzmK/z9cRfz94rqCRZWJ+bf/UE9Oeq08MQVb+ wIAD/mVFkqrHdgw+3YbfuQOZsin582Pf+tsnwrxE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728792AbfKSF1k (ORCPT ); Tue, 19 Nov 2019 00:27:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:45942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727036AbfKSF1i (ORCPT ); Tue, 19 Nov 2019 00:27:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1571B21939; Tue, 19 Nov 2019 05:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141257; bh=UuQWW+L4IQqGuH0JRhMtWTxzuWW1bEjd2yHLLq7S33Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r0D1AKUoNEm7jLX8+c9ujgRj4rr4TLERcn4TOKO06olUUSqiDHDDmkQgiLjdFoNDJ FbHde26+6kF3+H19i0dAl8WcD3YHIR3r0yuC/EdyzrdI8eiE8qksFsWDk6ktdEhqyl ArOUzz394nWloWTF2yc2FXLiQp3Pc6WAjVW7iRFM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dedy Lansky , Maya Erez , Kalle Valo , Sasha Levin Subject: [PATCH 4.19 060/422] wil6210: fix invalid memory access for rx_buff_mgmt debugfs Date: Tue, 19 Nov 2019 06:14:17 +0100 Message-Id: <20191119051403.621335942@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dedy Lansky [ Upstream commit 4405b632e3da839defec966e4b0be44d0c5e3102 ] Check rx_buff_mgmt is allocated before accessing its internal fields. Signed-off-by: Dedy Lansky Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/wil6210/debugfs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index 51c3330bc316f..ceace95b1595c 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c @@ -1263,6 +1263,9 @@ static int wil_rx_buff_mgmt_debugfs_show(struct seq_file *s, void *data) int num_active; int num_free; + if (!rbm->buff_arr) + return -EINVAL; + seq_printf(s, " size = %zu\n", rbm->size); seq_printf(s, " free_list_empty_cnt = %lu\n", rbm->free_list_empty_cnt); -- 2.20.1