From patchwork Fri Jun 19 16:49:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pPw31SZxzB4CF; Sat, 20 Jun 2020 02:51:31 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jmKEd-0007XR-VM; Fri, 19 Jun 2020 16:51:23 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmKDv-0006zq-Oy for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:50:39 +0000 Received: from mail-io1-f71.google.com ([209.85.166.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmKDu-0006LX-TE for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:50:39 +0000 Received: by mail-io1-f71.google.com with SMTP id g3so7219012ioc.20 for ; Fri, 19 Jun 2020 09:50:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EAAy2jsyO/x+py6Ttd3XgcKs2zdMfVXyxg2ZwvdpDoU=; b=X+PovGSa5gUmJ/7wjvJOBV6jX97sQ9/Iy6GuMHpSZ6wlJN8PMgzRByW/sBL2psWhNi 1c9lZBRnnw0n/P5z5tSOQVJ0edBgZrcQl9NT7vHSCjeLGDb62tklXjSAWyv/FhTMowfA u2gNMRIgNGLP5DmOW2mKXSRouRK0fN1FL1elmu7TRxStYxudRvIptInmsY4t7ODkLNZZ d1WasLx5jBAxQTWfiyUPP3Q9Awn2XAsXCh34Yhbp9rEIbh45g8iJS5adfNZfeBL6kYsO ZJoMFSmybPXtnjxV+qwvMJh48ulViCKthM4DRrIlhITHbRj0csFAOQgqfekCENUTtl2C NA8g== X-Gm-Message-State: AOAM533rT8z/yvzA2Uk2ldpQsQ7dcwYvInWXUmi4Ms9WItAl7ABBtrM6 XUEOAfCptCDh4PL1lHcrphNJsoB91luMtWBXnyCBgg8XSbn4ZZFf2KnAv/0VDWTgyEZ5Qr0J0LZ dLeW2RuZSZibfROrnw6k1rwptKk7MjY6TCYLyXqg2xg== X-Received: by 2002:a05:6602:2004:: with SMTP id y4mr5292635iod.130.1592585437662; Fri, 19 Jun 2020 09:50:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLdW51hi5XMMi2LmBBYPHjW/WhDDKSMRNvCp6AvFEgJRbIVNGZLmvke1q9C4J9xQYvnrhYrA== X-Received: by 2002:a05:6602:2004:: with SMTP id y4mr5292622iod.130.1592585437388; Fri, 19 Jun 2020 09:50:37 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id d71sm3547291ill.9.2020.06.19.09.50.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:50:36 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 21/57][X] Annotate hardware config module parameters in drivers/net/arcnet/ Date: Fri, 19 Jun 2020 11:49:34 -0500 Message-Id: <20200619165010.645925-22-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619165010.645925-1-seth.forshee@canonical.com> References: <20200619165010.645925-1-seth.forshee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: David Howells BugLink: https://bugs.launchpad.net/bugs/1884159 When the kernel is running in secure boot mode, we lock down the kernel to prevent userspace from modifying the running kernel image. Whilst this includes prohibiting access to things like /dev/mem, it must also prevent access by means of configuring driver modules in such a way as to cause a device to access or modify the kernel image. To this end, annotate module_param* statements that refer to hardware configuration and indicate for future reference what type of parameter they specify. The parameter parser in the core sees this information and can skip such parameters with an error message if the kernel is locked down. The module initialisation then runs as normal, but just sees whatever the default values for those parameters is. Note that we do still need to do the module initialisation because some drivers have viable defaults set in case parameters aren't specified and some drivers support automatic configuration (e.g. PNP or PCI) in addition to manually coded parameters. This patch annotates drivers in drivers/net/arcnet/. Suggested-by: Alan Cox Signed-off-by: David Howells cc: Michael Grzeschik cc: netdev@vger.kernel.org (cherry picked from commit 06a5128a29b3d67fadff5d9593d79b815d8b34d8) Signed-off-by: Seth Forshee --- drivers/net/arcnet/com20020-isa.c | 4 ++-- drivers/net/arcnet/com90io.c | 4 ++-- drivers/net/arcnet/com90xx.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c index b9e9931353b2..38fa60ddaf2e 100644 --- a/drivers/net/arcnet/com20020-isa.c +++ b/drivers/net/arcnet/com20020-isa.c @@ -129,8 +129,8 @@ static int clockp = 0; static int clockm = 0; module_param(node, int, 0); -module_param(io, int, 0); -module_param(irq, int, 0); +module_param_hw(io, int, ioport, 0); +module_param_hw(irq, int, irq, 0); module_param_string(device, device, sizeof(device), 0); module_param(timeout, int, 0); module_param(backplane, int, 0); diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index b57863df5bf5..4e56aaf2b984 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c @@ -347,8 +347,8 @@ static int io; /* use the insmod io= irq= shmem= options */ static int irq; static char device[9]; /* use eg. device=arc1 to change name */ -module_param(io, int, 0); -module_param(irq, int, 0); +module_param_hw(io, int, ioport, 0); +module_param_hw(irq, int, irq, 0); module_param_string(device, device, sizeof(device), 0); MODULE_LICENSE("GPL"); diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c index 0d9b45ff1bb2..7cbdfca6d189 100644 --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c @@ -88,8 +88,8 @@ static int irq; static int shmem; static char device[9]; /* use eg. device=arc1 to change name */ -module_param(io, int, 0); -module_param(irq, int, 0); +module_param_hw(io, int, ioport, 0); +module_param_hw(irq, int, irq, 0); module_param(shmem, int, 0); module_param_string(device, device, sizeof(device), 0);