From patchwork Fri Jun 19 16:15:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313071 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 49pP836fCdzB47D; Sat, 20 Jun 2020 02:16:51 +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 1jmJh7-0002J1-Nz; Fri, 19 Jun 2020 16:16:45 +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 1jmJgy-0002Az-Lm for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:36 +0000 Received: from mail-il1-f200.google.com ([209.85.166.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmJgx-0003a0-Mv for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:35 +0000 Received: by mail-il1-f200.google.com with SMTP id d3so171796ilq.9 for ; Fri, 19 Jun 2020 09:16:35 -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=AzqbAC/ES63EnFAvo4b4A9hsSBPEa2/RCHMG4gU+vck=; b=fzsN8pYbR+yAgLD2Wp91t6tJR7kefGQUilK2+lHZxTRSEFm18un+8JBLMKHNhXECkF w4wkWkTVV9fw4GI/4dq1Uln/CUS88KDB8c9+qZrE2/x99Pmf9wjGlMNrvh+pNkrFgLVY 4NbBKOyNup3zYUpA6fLHBxyl1F6iQ8mAEJ6i411lOXSVDd/y7IgcIlUrpAtQteD1SC8R F2rjWK97XkOg7HstZ4ar4anLUkzt3kze1LbWfhgAbBnYjmJutcSjHwpLl5tS2+gjoo5u 6fV0KjihzJvvM3qOZG4OmYt8rTCT3db+w2wy5Oya8knaCMcFbR50YpU20NCouGQurIE9 IwBw== X-Gm-Message-State: AOAM532CS4UeQRpycePQnJjgSPpRCoAypMw5pBM1tAMEn/PcFd/Zf2dq ZDduj4ns5PNif/R8FXBfqiIu6kxSsSs8fj2zAH3Ht3OKp9DwAQ1H139kbubHqUpd3bvPj1ALWyq Ir/DMFlWltcd4JAlz4P4a7R0SZBPfgrGux3jmIRu4uA== X-Received: by 2002:a92:d409:: with SMTP id q9mr4229243ilm.246.1592583394586; Fri, 19 Jun 2020 09:16:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKycMBTRMIYE4sSv7xcUXjJs19OkRiZMnJ99b1sq7uxn5lyeOHKN7HEv44yfF7tthxx2w8+g== X-Received: by 2002:a92:d409:: with SMTP id q9mr4229217ilm.246.1592583394342; Fri, 19 Jun 2020 09:16:34 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id x15sm3178707ilj.78.2020.06.19.09.16.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:16:33 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 09/57][B] Annotate hardware config module parameters in drivers/char/mwave/ Date: Fri, 19 Jun 2020 11:15:33 -0500 Message-Id: <20200619161621.644540-10-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619161621.644540-1-seth.forshee@canonical.com> References: <20200619161621.644540-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/char/mwave/. Suggested-by: Alan Cox Signed-off-by: David Howells (cherry picked from commit 94b599bc07c3c4f365f546218918dcbc363111b2) Signed-off-by: Seth Forshee --- drivers/char/mwave/mwavedd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c index 618f3df6c3b9..19c11efe78b1 100644 --- a/drivers/char/mwave/mwavedd.c +++ b/drivers/char/mwave/mwavedd.c @@ -81,10 +81,10 @@ int mwave_3780i_io = 0; int mwave_uart_irq = 0; int mwave_uart_io = 0; module_param(mwave_debug, int, 0); -module_param(mwave_3780i_irq, int, 0); -module_param(mwave_3780i_io, int, 0); -module_param(mwave_uart_irq, int, 0); -module_param(mwave_uart_io, int, 0); +module_param_hw(mwave_3780i_irq, int, irq, 0); +module_param_hw(mwave_3780i_io, int, ioport, 0); +module_param_hw(mwave_uart_irq, int, irq, 0); +module_param_hw(mwave_uart_io, int, ioport, 0); static int mwave_open(struct inode *inode, struct file *file); static int mwave_close(struct inode *inode, struct file *file);