From patchwork Thu Jun 18 23:12:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1312463 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 49nyS56xWgz9sNR; Fri, 19 Jun 2020 09:14:13 +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 1jm3jS-0000DH-D3; Thu, 18 Jun 2020 23:14:06 +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 1jm3ip-0008C7-Ni for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:27 +0000 Received: from mail-il1-f198.google.com ([209.85.166.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jm3io-0008Qa-Fa for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:26 +0000 Received: by mail-il1-f198.google.com with SMTP id a4so5157716ilq.2 for ; Thu, 18 Jun 2020 16:13:26 -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=tbI6OR9nO9H0Cyk/Yf25ljA+851AY89QAaFmaeHBgqc=; b=k+7lkDIIpE/n0gk+naNWvyRxa20bRQJNwyeU/TpYhSXK+i1n8Y0LzXq6hVDJKCCWnY pqAkCPTlWpZxZpRt4xGuuT76idyJ8tFx2TN3oihSiSkTs5WPRAlwOiZvYcux1OJNNrJO aG/1E4y7Fcqv0JPlRDvsbQU4zUXuU3Ch4xYukewry4rRfwBimo9Fws25hauaR2aOCfJq Z+iQNB31FKjn7c9j2iP4t+M6rghIddf0NuDpEx4wMYWvYpYyrALZ/K+gqiIfsqaNBov8 iDn5ZV+8x/axoidxSrk4RHn6HPYEzhvnLLxSOMftzIxRjXiuO63v9EEpwzZOl3e4gVy7 V1sA== X-Gm-Message-State: AOAM533Yr+LG6beFTa7hbifrqoBO/aqk1YmDasG7VHNnrvOlJo1mi7vQ d0JLjOqVZT9g73PYefTz/iMwLmTRuMSQ5EnHXJxBIDkpQXYmgmrzlmOLBahumTgFXX7eU/u5Z4b fCGBI8BOgeSnrOmzzZFwky5EgH0Hm7MNedsIutwjIlA== X-Received: by 2002:a5d:9a13:: with SMTP id s19mr1236997iol.20.1592522005289; Thu, 18 Jun 2020 16:13:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7woCxQANiDvnzZ8+PcB2uOIoHeKFp2nvt+2KrYXQsSWiMyAWCqkPp1Tow0aeA7bDKc/506w== X-Received: by 2002:a5d:9a13:: with SMTP id s19mr1236982iol.20.1592522005066; Thu, 18 Jun 2020 16:13:25 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id r1sm2249788iln.77.2020.06.18.16.13.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 16:13:24 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 19/47][X] Annotate hardware config module parameters in drivers/mmc/host/ Date: Thu, 18 Jun 2020 18:12:30 -0500 Message-Id: <20200618231258.630575-20-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200618231258.630575-1-seth.forshee@canonical.com> References: <20200618231258.630575-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/mmc/host/. Suggested-by: Alan Cox Signed-off-by: David Howells cc: Pierre Ossman cc: Ulf Hansson cc: linux-mmc@vger.kernel.org (cherry picked from commit dac562fc5ff4956d779029d2ae379e34c791f011) Signed-off-by: Seth Forshee --- drivers/mmc/host/wbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index c3fd16d997ca..76c7f643fab5 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c @@ -1995,11 +1995,11 @@ static void __exit wbsd_drv_exit(void) module_init(wbsd_drv_init); module_exit(wbsd_drv_exit); #ifdef CONFIG_PNP -module_param_named(nopnp, param_nopnp, uint, 0444); +module_param_hw_named(nopnp, param_nopnp, uint, other, 0444); #endif -module_param_named(io, param_io, uint, 0444); -module_param_named(irq, param_irq, uint, 0444); -module_param_named(dma, param_dma, int, 0444); +module_param_hw_named(io, param_io, uint, ioport, 0444); +module_param_hw_named(irq, param_irq, uint, irq, 0444); +module_param_hw_named(dma, param_dma, int, dma, 0444); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Pierre Ossman ");