From patchwork Thu Sep 7 19:35:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 811126 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="mDLV5suJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xp9fC4THvz9sDB for ; Fri, 8 Sep 2017 05:35:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755753AbdIGTfS (ORCPT ); Thu, 7 Sep 2017 15:35:18 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34005 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755588AbdIGTfQ (ORCPT ); Thu, 7 Sep 2017 15:35:16 -0400 Received: by mail-pf0-f175.google.com with SMTP id e1so1008694pfk.1 for ; Thu, 07 Sep 2017 12:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=A3eeeBrmttbXX77QlK6RdeFOrlFr5YJTyzSXrXhtdEM=; b=mDLV5suJln1pnBtzkyGYKzXMr+9LgIn3n+WMYnY33i9D9KClMuJ06XwTEy+rq8JuNC wk5+Sqaze5l3sxamX8vqwInFFL8/8UQO/hXzJdx3rz++lCmfDsdvRz+Gd1w9jNAy9Cma oPNofnxqTgnFU4FLKuXaKDMgvTWbgiP1w+2R0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=A3eeeBrmttbXX77QlK6RdeFOrlFr5YJTyzSXrXhtdEM=; b=HzkI8pMQZmcMIRv18OyLx5f7Kevc9Zt0DGvkosCgVFPyU1CPx7eDo500itgUeOFJxa 60GDGwYLg6QOun2svB8K1yam5s15805Xgx1yHMkim4XN2wTNivqkuM1iJAwX/A2bMil5 atR7VGUJHLFGZaimGf9IWfAh2y8nZ60JztfsRis/ho1V7Sq3POr0E7yMDkphHX5ZcQxl gjIh1tOoRKnFpjRHZG72JLpDLIIFyVjkBJhB+Q938bpatxo2n/6DOLlWsvQVfUC2Ojoz 0/4Mp84SYX8Er3ftoiqqGTZnmT7Qyo2lTxrpkCLwiq2N7A7vs4UKWesbNFEd1Od2Z3tk 13IA== X-Gm-Message-State: AHPjjUiTsP2Ow/0CeNvqGIKgmu2HXEd+7EQjzIRbWHbr8k4pua0k6D88 XCfSGV0+A2MlJq0k7+GVVA== X-Google-Smtp-Source: ADKCNb7bPUlIDMU3EXxp/wTfoSFNXTU7aUproUuxcadC0Eq5g2o8WWP2JJHsgYVmAaVf1YGGDbZx3A== X-Received: by 10.101.85.4 with SMTP id f4mr497506pgr.10.1504812916218; Thu, 07 Sep 2017 12:35:16 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id r12sm492373pfd.187.2017.09.07.12.35.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2017 12:35:15 -0700 (PDT) Date: Thu, 7 Sep 2017 12:35:14 -0700 From: Kees Cook To: netdev@vger.kernel.org Cc: "David S. Miller" , Jarod Wilson , "Gustavo A. R. Silva" , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: tulip: Constify tulip_tbl Message-ID: <20170907193514.GA114400@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It looks like all users of tulip_tbl are reads, so mark this table as read-only. $ git grep tulip_tbl # edited to avoid line-wraps... interrupt.c: iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ... interrupt.c: iowrite32(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ... interrupt.c: iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ... interrupt.c: iowrite32(tulip_tbl[tp->chip_id].valid_intrs | TimerInt, pnic.c: iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7); tulip.h: extern struct tulip_chip_table tulip_tbl[]; tulip_core.c:struct tulip_chip_table tulip_tbl[] = { tulip_core.c:iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR5); tulip_core.c:iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7); tulip_core.c:setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer, tulip_core.c:const char *chip_name = tulip_tbl[chip_idx].chip_name; tulip_core.c:if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) tulip_core.c:ioaddr = pci_iomap(..., tulip_tbl[chip_idx].io_size); tulip_core.c:tp->flags = tulip_tbl[chip_idx].flags; tulip_core.c:setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer, tulip_core.c:INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task); Cc: "David S. Miller" Cc: Jarod Wilson Cc: "Gustavo A. R. Silva" Cc: netdev@vger.kernel.org Cc: linux-parisc@vger.kernel.org Signed-off-by: Kees Cook --- drivers/net/ethernet/dec/tulip/tulip.h | 2 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/tulip.h b/drivers/net/ethernet/dec/tulip/tulip.h index 38431a155f09..06660dbc44b7 100644 --- a/drivers/net/ethernet/dec/tulip/tulip.h +++ b/drivers/net/ethernet/dec/tulip/tulip.h @@ -515,7 +515,7 @@ void comet_timer(unsigned long data); extern int tulip_debug; extern const char * const medianame[]; extern const char tulip_media_cap[]; -extern struct tulip_chip_table tulip_tbl[]; +extern const struct tulip_chip_table tulip_tbl[]; void oom_timer(unsigned long data); extern u8 t21040_csr13[]; diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 84394b43c0a1..851b6d1f5a42 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -138,7 +138,7 @@ static void tulip_timer(unsigned long data) * It is indexed via the values in 'enum chips' */ -struct tulip_chip_table tulip_tbl[] = { +const struct tulip_chip_table tulip_tbl[] = { { }, /* placeholder for array, slot unused currently */ { }, /* placeholder for array, slot unused currently */