public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: David Howells <dhowells@redhat.com>
Cc: linux-kernel@vger.kernel.org, gnomes@lxorguk.ukuu.org.uk,
	minyard@acm.org, linux-security-module@vger.kernel.org,
	keyrings@vger.kernel.org, linux-input@vger.kernel.org
Subject: Re: [PATCH 11/39] Annotate hardware config module parameters in drivers/input/
Date: Sat, 3 Dec 2016 10:51:07 -0800	[thread overview]
Message-ID: <20161203185107.GG38119@dtor-ws> (raw)
In-Reply-To: <148059546313.31612.2626035532274833157.stgit@warthog.procyon.org.uk>

On Thu, Dec 01, 2016 at 12:31:03PM +0000, David Howells wrote:
> 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/input/.
> 
> Suggested-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> cc: linux-input@vger.kernel.org

Please merge with the rest of patches.

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

> ---
> 
>  drivers/input/mouse/inport.c      |    2 +-
>  drivers/input/mouse/logibm.c      |    2 +-
>  drivers/input/touchscreen/mk712.c |    4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c
> index 3827a22362de..9ce71dfa0de1 100644
> --- a/drivers/input/mouse/inport.c
> +++ b/drivers/input/mouse/inport.c
> @@ -78,7 +78,7 @@ MODULE_LICENSE("GPL");
>  #define INPORT_IRQ		5
>  
>  static int inport_irq = INPORT_IRQ;
> -module_param_named(irq, inport_irq, uint, 0);
> +module_param_hw_named(irq, inport_irq, uint, irq, 0);
>  MODULE_PARM_DESC(irq, "IRQ number (5=default)");
>  
>  static struct input_dev *inport_dev;
> diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c
> index e2413113df22..6f165e053f4d 100644
> --- a/drivers/input/mouse/logibm.c
> +++ b/drivers/input/mouse/logibm.c
> @@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
>  #define LOGIBM_IRQ		5
>  
>  static int logibm_irq = LOGIBM_IRQ;
> -module_param_named(irq, logibm_irq, uint, 0);
> +module_param_hw_named(irq, logibm_irq, uint, irq, 0);
>  MODULE_PARM_DESC(irq, "IRQ number (5=default)");
>  
>  static struct input_dev *logibm_dev;
> diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
> index 36e57deacd03..bd5352824f77 100644
> --- a/drivers/input/touchscreen/mk712.c
> +++ b/drivers/input/touchscreen/mk712.c
> @@ -50,11 +50,11 @@ MODULE_DESCRIPTION("ICS MicroClock MK712 TouchScreen driver");
>  MODULE_LICENSE("GPL");
>  
>  static unsigned int mk712_io = 0x260;	/* Also 0x200, 0x208, 0x300 */
> -module_param_named(io, mk712_io, uint, 0);
> +module_param_hw_named(io, mk712_io, uint, ioport, 0);
>  MODULE_PARM_DESC(io, "I/O base address of MK712 touchscreen controller");
>  
>  static unsigned int mk712_irq = 10;	/* Also 12, 14, 15 */
> -module_param_named(irq, mk712_irq, uint, 0);
> +module_param_hw_named(irq, mk712_irq, uint, irq, 0);
>  MODULE_PARM_DESC(irq, "IRQ of MK712 touchscreen controller");
>  
>  /* eight 8-bit registers */
> 

-- 
Dmitry

  reply	other threads:[~2016-12-03 18:51 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-01 12:29 [PATCH 00/39] Annotate hw config module params for future lockdown David Howells
2016-12-01 12:29 ` [PATCH 01/39] Annotate module params that specify hardware parameters (eg. ioport) David Howells
2016-12-01 15:01   ` Greg KH
2016-12-01 16:02     ` David Howells
2016-12-05 21:12       ` One Thousand Gnomes
2016-12-06  7:11         ` Greg KH
2016-12-06 10:42           ` David Howells
2016-12-06 10:50             ` Greg KH
2016-12-02  3:07     ` Matthew Garrett
2016-12-02  6:55       ` Greg KH
2016-12-02  7:12         ` Matthew Garrett
2016-12-05 21:26           ` One Thousand Gnomes
2016-12-02 14:59         ` David Howells
2016-12-05 15:47           ` Greg KH
2016-12-06 10:54             ` David Howells
2016-12-01 12:29 ` [PATCH 02/39] Annotate hardware config module parameters in arch/x86/mm/ David Howells
2016-12-01 12:30 ` [PATCH 03/39] Annotate hardware config module parameters in drivers/char/ipmi/ David Howells
2016-12-01 13:14   ` Corey Minyard
2016-12-01 12:30 ` [PATCH 04/39] Annotate hardware config module parameters in drivers/char/mwave/ David Howells
2016-12-01 12:30 ` [PATCH 05/39] Annotate hardware config module parameters in drivers/char/ David Howells
2016-12-01 12:30 ` [PATCH 06/39] Annotate hardware config module parameters in drivers/clocksource/ David Howells
2016-12-01 12:30 ` [PATCH 07/39] Annotate hardware config module parameters in drivers/cpufreq/ David Howells
2016-12-01 14:02   ` Rafael J. Wysocki
2016-12-01 14:19     ` David Howells
2016-12-01 14:21       ` Rafael J. Wysocki
2016-12-01 12:30 ` [PATCH 08/39] Annotate hardware config module parameters in drivers/gpio/ David Howells
2016-12-01 13:49   ` William Breathitt Gray
2016-12-02 12:55   ` Linus Walleij
2016-12-01 12:30 ` [PATCH 09/39] Annotate hardware config module parameters in drivers/i2c/ David Howells
2016-12-01 13:47   ` Jean Delvare
2016-12-01 14:12     ` David Howells
2016-12-01 16:06       ` Jean Delvare
2016-12-05 21:09       ` One Thousand Gnomes
2016-12-01 12:30 ` [PATCH 10/39] Annotate hardware config module parameters in drivers/iio/ David Howells
2016-12-01 13:50   ` William Breathitt Gray
2016-12-03  9:05     ` Jonathan Cameron
2016-12-07 13:43       ` David Howells
2016-12-01 12:31 ` [PATCH 11/39] Annotate hardware config module parameters in drivers/input/ David Howells
2016-12-03 18:51   ` Dmitry Torokhov [this message]
2016-12-01 12:31 ` [PATCH 12/39] Annotate hardware config module parameters in drivers/isdn/ David Howells
2016-12-01 12:31 ` [PATCH 13/39] Annotate hardware config module parameters in drivers/media/ David Howells
2016-12-01 12:31 ` [PATCH 14/39] Annotate hardware config module parameters in drivers/misc/ David Howells
2016-12-01 12:31 ` [PATCH 15/39] Annotate hardware config module parameters in drivers/mmc/host/ David Howells
2016-12-01 12:31 ` [PATCH 16/39] Annotate hardware config module parameters in drivers/net/appletalk/ David Howells
2016-12-01 12:31 ` [PATCH 17/39] Annotate hardware config module parameters in drivers/net/arcnet/ David Howells
2016-12-01 12:32 ` [PATCH 18/39] Annotate hardware config module parameters in drivers/net/can/ David Howells
2016-12-01 13:05   ` Marc Kleine-Budde
2016-12-01 12:32 ` [PATCH 19/39] Annotate hardware config module parameters in drivers/net/ethernet/ David Howells
2016-12-01 12:32 ` [PATCH 20/39] Annotate hardware config module parameters in drivers/net/hamradio/ David Howells
2016-12-01 12:32 ` [PATCH 21/39] Annotate hardware config module parameters in drivers/net/irda/ David Howells
2016-12-01 12:32 ` [PATCH 22/39] Annotate hardware config module parameters in drivers/net/wan/ David Howells
2016-12-01 12:32 ` [PATCH 23/39] Annotate hardware config module parameters in drivers/net/wireless/ David Howells
2016-12-02  5:04   ` Kalle Valo
2016-12-07 13:45     ` David Howells
2016-12-01 12:32 ` [PATCH 24/39] Annotate hardware config module parameters in drivers/parport/ David Howells
2016-12-01 12:32 ` [PATCH 25/39] Annotate hardware config module parameters in drivers/pci/hotplug/ David Howells
2016-12-07 18:34   ` Bjorn Helgaas
2016-12-01 12:33 ` [PATCH 26/39] Annotate hardware config module parameters in drivers/pcmcia/ David Howells
2016-12-01 12:33 ` [PATCH 27/39] Annotate hardware config module parameters in drivers/scsi/ David Howells
2016-12-01 22:05   ` Finn Thain
2017-04-05 14:33     ` David Howells
2016-12-01 12:33 ` [PATCH 28/39] Annotate hardware config module parameters in drivers/staging/i4l/ David Howells
2016-12-01 12:33 ` [PATCH 29/39] Annotate hardware config module parameters in drivers/staging/media/ David Howells
2016-12-01 14:54   ` Mauro Carvalho Chehab
2016-12-01 14:59     ` David Howells
2016-12-01 15:17       ` Mauro Carvalho Chehab
2016-12-01 12:33 ` [PATCH 30/39] Annotate hardware config module parameters in drivers/staging/speakup/ David Howells
2016-12-01 12:33 ` [PATCH 31/39] Annotate hardware config module parameters in drivers/staging/vme/ David Howells
2016-12-01 12:33 ` [PATCH 32/39] Annotate hardware config module parameters in drivers/tty/ David Howells
2016-12-01 15:02   ` Greg Kroah-Hartman
2016-12-01 12:34 ` [PATCH 33/39] Annotate hardware config module parameters in drivers/video/ David Howells
2016-12-01 12:34 ` [PATCH 34/39] Annotate hardware config module parameters in drivers/watchdog/ David Howells
2016-12-01 12:58   ` Guenter Roeck
2016-12-01 12:34 ` [PATCH 35/39] Annotate hardware config module parameters in fs/pstore/ David Howells
2016-12-01 12:34 ` [PATCH 36/39] Annotate hardware config module parameters in sound/drivers/ David Howells
2016-12-01 12:34 ` [PATCH 37/39] Annotate hardware config module parameters in sound/isa/ David Howells
2016-12-01 12:34 ` [PATCH 38/39] Annotate hardware config module parameters in sound/oss/ David Howells
2016-12-01 12:34 ` [PATCH 39/39] Annotate hardware config module parameters in sound/pci/ David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161203185107.GG38119@dtor-ws \
    --to=dmitry.torokhov@gmail.com \
    --cc=dhowells@redhat.com \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=minyard@acm.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox