From patchwork Wed Dec 10 09:39:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 419493 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9FC2C1400F1 for ; Wed, 10 Dec 2014 20:40:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753688AbaLJJkJ (ORCPT ); Wed, 10 Dec 2014 04:40:09 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:59287 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbaLJJkF (ORCPT ); Wed, 10 Dec 2014 04:40:05 -0500 Received: by mail-pd0-f170.google.com with SMTP id v10so2473103pde.1 for ; Wed, 10 Dec 2014 01:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=ltSUjARZnwOcQRPQqpvjDJAS3GDssAVbQwe2kce529I=; b=KoPO3SaMDJCIJ1nigq0U9PMJi5Bz+HxmZZtxeOFVeE4fpNYjx36I1kdPAIigniXYrT r7Q7zhpdPT6YOtnaw9duiLjVuSLMGexqj909Ti0FnBOzuADIYqgUdwuNcTxdgZ8WW9HZ cdqXXWRrr2r6JMLs0ZW0QICqsimoc2FILGh6RYCQFfdmZQCs1WZGWp5Tge+x6OdJhYoY HvRSY7i/dEKBm+QltE3lgbhx167u0TbIMUUyhlJBmwgd3/JTkyK2XlIqnOShZlNIV9nS Yc12PVa6LfNPxZiZHXXsufATLJFAXQ/WaKkoyth5aDKi5YneRG4O/15jGYpyoP/8X6Ec 0N4Q== X-Received: by 10.68.189.136 with SMTP id gi8mr5660293pbc.54.1418204404329; Wed, 10 Dec 2014 01:40:04 -0800 (PST) Received: from localhost.localdomain (cpe-76-173-170-164.socal.res.rr.com. [76.173.170.164]) by mx.google.com with ESMTPSA id nv7sm3686420pdb.68.2014.12.10.01.40.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Dec 2014 01:40:03 -0800 (PST) From: Brian Norris To: "John W. Linville" Cc: Brian Norris , Brett Rudley , Arend van Spriel , "Franky (Zhenhui) Lin" , Hante Meuleman , linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com, netdev@vger.kernel.org Subject: [PATCH] brcmsmac: don't leak kernel memory via printk() Date: Wed, 10 Dec 2014 01:39:18 -0800 Message-Id: <1418204358-8357-1-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 2.2.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Debug code prints the fifo name via custom dev_warn() wrappers. The fifo_names array is only non-zero when debugging is manually enabled, which is all well and good. However, it's *not* good that this array uses zero-length arrays in the non-debug case, and so it doesn't actually have any memory allocated to it. This means that as far as we know, fifo_names[i] actually points to garbage memory. I've seen this in my log: [ 4601.205511] brcmsmac bcma0:1: wl0: brcms_c_d11hdrs_mac80211: �GeL txop exceeded phylen 137/256 dur 1602/1504 So let's give this array space enough to fill it with a NULL byte. Signed-off-by: Brian Norris Cc: Brett Rudley Cc: Arend van Spriel Cc: "Franky (Zhenhui) Lin" Cc: Hante Meuleman Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Cc: brcm80211-dev-list@broadcom.com Cc: netdev@vger.kernel.org --- drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 1b474828d5b8..aed0c948dce8 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -316,7 +316,7 @@ static const u16 xmtfifo_sz[][NFIFO] = { static const char * const fifo_names[] = { "AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" }; #else -static const char fifo_names[6][0]; +static const char fifo_names[6][1]; #endif #ifdef DEBUG