Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934153AbcLAMd3 (ORCPT ); Thu, 1 Dec 2016 07:33:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43816 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934089AbcLAMdZ (ORCPT ); Thu, 1 Dec 2016 07:33:25 -0500 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 28/39] Annotate hardware config module parameters in drivers/staging/i4l/ From: David Howells To: linux-kernel@vger.kernel.org Cc: devel@driverdev.osuosl.org, gnomes@lxorguk.ukuu.org.uk, minyard@acm.org, Greg Kroah-Hartman , dhowells@redhat.com, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org Date: Thu, 01 Dec 2016 12:33:22 +0000 Message-ID: <148059560247.31612.15895474927855642779.stgit@warthog.procyon.org.uk> In-Reply-To: <148059537897.31612.9461043954611464597.stgit@warthog.procyon.org.uk> References: <148059537897.31612.9461043954611464597.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 01 Dec 2016 12:33:25 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3544 Lines: 79 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/staging/i4l/. Suggested-by: One Thousand Gnomes Signed-off-by: David Howells cc: Greg Kroah-Hartman cc: devel@driverdev.osuosl.org --- drivers/staging/i4l/act2000/module.c | 6 +++--- drivers/staging/i4l/icn/icn.c | 4 ++-- drivers/staging/i4l/pcbit/module.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/i4l/act2000/module.c b/drivers/staging/i4l/act2000/module.c index 99c9c0a1c63e..b3c81e2af7b2 100644 --- a/drivers/staging/i4l/act2000/module.c +++ b/drivers/staging/i4l/act2000/module.c @@ -40,9 +40,9 @@ MODULE_PARM_DESC(act_bus, "BusType of first card, 1=ISA, 2=MCA, 3=PCMCIA, curren MODULE_PARM_DESC(act_port, "Base port address of first card"); MODULE_PARM_DESC(act_irq, "IRQ of first card"); MODULE_PARM_DESC(act_id, "ID-String of first card"); -module_param(act_bus, int, 0); -module_param(act_port, int, 0); -module_param(act_irq, int, 0); +module_param_hw(act_bus, int, other, 0); +module_param_hw(act_port, int, ioport, 0); +module_param_hw(act_irq, int, irq, 0); module_param(act_id, charp, 0); static int act2000_addcard(int, int, int, char *); diff --git a/drivers/staging/i4l/icn/icn.c b/drivers/staging/i4l/icn/icn.c index 514bfc2c5b53..cadeee74e9f4 100644 --- a/drivers/staging/i4l/icn/icn.c +++ b/drivers/staging/i4l/icn/icn.c @@ -23,9 +23,9 @@ static char *icn_id2 = "\0"; MODULE_DESCRIPTION("ISDN4Linux: Driver for ICN active ISDN card"); MODULE_AUTHOR("Fritz Elfert"); MODULE_LICENSE("GPL"); -module_param(portbase, int, 0); +module_param_hw(portbase, int, ioport, 0); MODULE_PARM_DESC(portbase, "Port address of first card"); -module_param(membase, ulong, 0); +module_param_hw(membase, ulong, iomem, 0); MODULE_PARM_DESC(membase, "Shared memory address of all cards"); module_param(icn_id, charp, 0); MODULE_PARM_DESC(icn_id, "ID-String of first card"); diff --git a/drivers/staging/i4l/pcbit/module.c b/drivers/staging/i4l/pcbit/module.c index 0a59bd0b8210..5a3ea2808351 100644 --- a/drivers/staging/i4l/pcbit/module.c +++ b/drivers/staging/i4l/pcbit/module.c @@ -25,8 +25,8 @@ MODULE_LICENSE("GPL"); static int mem[MAX_PCBIT_CARDS]; static int irq[MAX_PCBIT_CARDS]; -module_param_array(mem, int, NULL, 0); -module_param_array(irq, int, NULL, 0); +module_param_hw_array(mem, int, iomem, NULL, 0); +module_param_hw_array(irq, int, irq, NULL, 0); static int num_boards; struct pcbit_dev *dev_pcbit[MAX_PCBIT_CARDS];