From: David Howells <dhowells@redhat.com> To: linux-kernel@vger.kernel.org Cc: Alexandre Courbot <gnurou@gmail.com>, gnomes@lxorguk.ukuu.org.uk, gregkh@linuxfoundation.org, Linus Walleij <linus.walleij@linaro.org>, William Breathitt Gray <vilhelm.gray@gmail.com>, dhowells@redhat.com, linux-gpio@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH 08/38] Annotate hardware config module parameters in drivers/gpio/ Date: Wed, 05 Apr 2017 17:57:54 +0100 [thread overview] Message-ID: <149141147489.29162.566616944109123278.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <149141141298.29162.5612793122429261720.stgit@warthog.procyon.org.uk> 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/gpio/. Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> cc: Alexandre Courbot <gnurou@gmail.com> cc: linux-gpio@vger.kernel.org --- drivers/gpio/gpio-104-dio-48e.c | 4 ++-- drivers/gpio/gpio-104-idi-48.c | 4 ++-- drivers/gpio/gpio-104-idio-16.c | 4 ++-- drivers/gpio/gpio-gpio-mm.c | 2 +- drivers/gpio/gpio-ws16c48.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c index 17bd2ab4ebe2..dfa1a298e4f6 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -33,11 +33,11 @@ static unsigned int base[MAX_NUM_DIO48E]; static unsigned int num_dio48e; -module_param_array(base, uint, &num_dio48e, 0); +module_param_hw_array(base, uint, ioport, &num_dio48e, 0); MODULE_PARM_DESC(base, "ACCES 104-DIO-48E base addresses"); static unsigned int irq[MAX_NUM_DIO48E]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers"); /** diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 568375a7ebc2..c369b2083876 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -33,11 +33,11 @@ static unsigned int base[MAX_NUM_IDI_48]; static unsigned int num_idi_48; -module_param_array(base, uint, &num_idi_48, 0); +module_param_hw_array(base, uint, ioport, &num_idi_48, 0); MODULE_PARM_DESC(base, "ACCES 104-IDI-48 base addresses"); static unsigned int irq[MAX_NUM_IDI_48]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line numbers"); /** diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-16.c index 7053cf736648..5949123986f2 100644 --- a/drivers/gpio/gpio-104-idio-16.c +++ b/drivers/gpio/gpio-104-idio-16.c @@ -33,11 +33,11 @@ static unsigned int base[MAX_NUM_IDIO_16]; static unsigned int num_idio_16; -module_param_array(base, uint, &num_idio_16, 0); +module_param_hw_array(base, uint, ioport, &num_idio_16, 0); MODULE_PARM_DESC(base, "ACCES 104-IDIO-16 base addresses"); static unsigned int irq[MAX_NUM_IDIO_16]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDIO-16 interrupt line numbers"); /** diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c index fa4baa2543db..11ade5b288f8 100644 --- a/drivers/gpio/gpio-gpio-mm.c +++ b/drivers/gpio/gpio-gpio-mm.c @@ -31,7 +31,7 @@ static unsigned int base[MAX_NUM_GPIOMM]; static unsigned int num_gpiomm; -module_param_array(base, uint, &num_gpiomm, 0); +module_param_hw_array(base, uint, ioport, &num_gpiomm, 0); MODULE_PARM_DESC(base, "Diamond Systems GPIO-MM base addresses"); /** diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 901b5ccb032d..f8a4f91f36c7 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c @@ -30,11 +30,11 @@ static unsigned int base[MAX_NUM_WS16C48]; static unsigned int num_ws16c48; -module_param_array(base, uint, &num_ws16c48, 0); +module_param_hw_array(base, uint, ioport, &num_ws16c48, 0); MODULE_PARM_DESC(base, "WinSystems WS16C48 base addresses"); static unsigned int irq[MAX_NUM_WS16C48]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "WinSystems WS16C48 interrupt line numbers"); /**
WARNING: multiple messages have this Message-ID (diff)
From: dhowells@redhat.com (David Howells) To: linux-security-module@vger.kernel.org Subject: [PATCH 08/38] Annotate hardware config module parameters in drivers/gpio/ Date: Wed, 05 Apr 2017 17:57:54 +0100 [thread overview] Message-ID: <149141147489.29162.566616944109123278.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <149141141298.29162.5612793122429261720.stgit@warthog.procyon.org.uk> 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/gpio/. Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> cc: Alexandre Courbot <gnurou@gmail.com> cc: linux-gpio at vger.kernel.org --- drivers/gpio/gpio-104-dio-48e.c | 4 ++-- drivers/gpio/gpio-104-idi-48.c | 4 ++-- drivers/gpio/gpio-104-idio-16.c | 4 ++-- drivers/gpio/gpio-gpio-mm.c | 2 +- drivers/gpio/gpio-ws16c48.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c index 17bd2ab4ebe2..dfa1a298e4f6 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -33,11 +33,11 @@ static unsigned int base[MAX_NUM_DIO48E]; static unsigned int num_dio48e; -module_param_array(base, uint, &num_dio48e, 0); +module_param_hw_array(base, uint, ioport, &num_dio48e, 0); MODULE_PARM_DESC(base, "ACCES 104-DIO-48E base addresses"); static unsigned int irq[MAX_NUM_DIO48E]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers"); /** diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 568375a7ebc2..c369b2083876 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -33,11 +33,11 @@ static unsigned int base[MAX_NUM_IDI_48]; static unsigned int num_idi_48; -module_param_array(base, uint, &num_idi_48, 0); +module_param_hw_array(base, uint, ioport, &num_idi_48, 0); MODULE_PARM_DESC(base, "ACCES 104-IDI-48 base addresses"); static unsigned int irq[MAX_NUM_IDI_48]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line numbers"); /** diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-16.c index 7053cf736648..5949123986f2 100644 --- a/drivers/gpio/gpio-104-idio-16.c +++ b/drivers/gpio/gpio-104-idio-16.c @@ -33,11 +33,11 @@ static unsigned int base[MAX_NUM_IDIO_16]; static unsigned int num_idio_16; -module_param_array(base, uint, &num_idio_16, 0); +module_param_hw_array(base, uint, ioport, &num_idio_16, 0); MODULE_PARM_DESC(base, "ACCES 104-IDIO-16 base addresses"); static unsigned int irq[MAX_NUM_IDIO_16]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDIO-16 interrupt line numbers"); /** diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c index fa4baa2543db..11ade5b288f8 100644 --- a/drivers/gpio/gpio-gpio-mm.c +++ b/drivers/gpio/gpio-gpio-mm.c @@ -31,7 +31,7 @@ static unsigned int base[MAX_NUM_GPIOMM]; static unsigned int num_gpiomm; -module_param_array(base, uint, &num_gpiomm, 0); +module_param_hw_array(base, uint, ioport, &num_gpiomm, 0); MODULE_PARM_DESC(base, "Diamond Systems GPIO-MM base addresses"); /** diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 901b5ccb032d..f8a4f91f36c7 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c @@ -30,11 +30,11 @@ static unsigned int base[MAX_NUM_WS16C48]; static unsigned int num_ws16c48; -module_param_array(base, uint, &num_ws16c48, 0); +module_param_hw_array(base, uint, ioport, &num_ws16c48, 0); MODULE_PARM_DESC(base, "WinSystems WS16C48 base addresses"); static unsigned int irq[MAX_NUM_WS16C48]; -module_param_array(irq, uint, NULL, 0); +module_param_hw_array(irq, uint, irq, NULL, 0); MODULE_PARM_DESC(irq, "WinSystems WS16C48 interrupt line numbers"); /** -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-04-05 16:57 UTC|newest] Thread overview: 149+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-05 16:56 [PATCH 00/38] Annotate hw config module params for future lockdown David Howells 2017-04-05 16:56 ` David Howells 2017-04-05 16:57 ` [PATCH 01/38] Annotate module params that specify hardware parameters (eg. ioport) David Howells 2017-04-05 16:57 ` David Howells 2017-04-05 16:57 ` [PATCH 02/38] Annotate hardware config module parameters in arch/x86/mm/ David Howells 2017-04-05 16:57 ` David Howells 2017-04-05 16:57 ` David Howells 2017-04-05 17:35 ` Steven Rostedt 2017-04-05 17:35 ` Steven Rostedt 2017-04-05 17:35 ` Steven Rostedt 2017-04-14 18:15 ` Thomas Gleixner 2017-04-14 18:15 ` Thomas Gleixner 2017-04-18 12:38 ` David Howells 2017-04-18 12:38 ` David Howells 2017-04-18 12:38 ` David Howells 2017-04-05 16:57 ` [PATCH 03/38] Annotate hardware config module parameters in drivers/char/ipmi/ David Howells 2017-04-05 16:57 ` David Howells 2017-04-05 16:57 ` [PATCH 04/38] Annotate hardware config module parameters in drivers/char/mwave/ David Howells 2017-04-05 16:57 ` David Howells 2017-04-05 16:57 ` [PATCH 05/38] Annotate hardware config module parameters in drivers/char/ David Howells 2017-04-05 16:57 ` David Howells 2017-04-08 15:23 ` Greg KH 2017-04-08 15:23 ` Greg KH 2017-04-05 16:57 ` [PATCH 06/38] Annotate hardware config module parameters in drivers/clocksource/ David Howells 2017-04-05 16:57 ` David Howells 2017-04-14 18:25 ` Thomas Gleixner 2017-04-14 18:25 ` Thomas Gleixner 2017-04-18 16:24 ` Jens Rottmann 2017-04-18 16:24 ` Jens Rottmann 2017-04-18 16:34 ` Jens Rottmann 2017-04-18 16:34 ` Jens Rottmann 2017-04-19 15:29 ` David Howells 2017-04-19 15:29 ` David Howells 2017-04-14 22:59 ` David Howells 2017-04-14 22:59 ` David Howells 2017-04-15 5:49 ` Thomas Gleixner 2017-04-15 5:49 ` Thomas Gleixner 2017-04-15 5:51 ` David Howells 2017-04-15 5:51 ` David Howells 2017-04-15 9:54 ` Thomas Gleixner 2017-04-15 9:54 ` Thomas Gleixner 2017-04-18 12:43 ` David Howells 2017-04-18 12:43 ` David Howells 2017-04-18 12:54 ` Thomas Gleixner 2017-04-18 12:54 ` Thomas Gleixner 2017-04-19 15:33 ` David Howells 2017-04-19 15:33 ` David Howells 2017-04-05 16:57 ` [PATCH 07/38] Annotate hardware config module parameters in drivers/cpufreq/ David Howells 2017-04-05 16:57 ` David Howells 2017-04-10 10:33 ` Viresh Kumar 2017-04-10 10:33 ` Viresh Kumar 2017-04-05 16:57 ` David Howells [this message] 2017-04-05 16:57 ` [PATCH 08/38] Annotate hardware config module parameters in drivers/gpio/ David Howells 2017-04-07 10:42 ` Linus Walleij 2017-04-07 10:42 ` Linus Walleij 2017-04-07 12:52 ` David Howells 2017-04-07 12:52 ` David Howells 2017-04-05 16:58 ` [PATCH 09/38] Annotate hardware config module parameters in drivers/i2c/ David Howells 2017-04-05 16:58 ` David Howells 2017-04-19 19:25 ` Wolfram Sang 2017-04-19 19:25 ` Wolfram Sang 2017-04-20 7:31 ` Jean Delvare 2017-04-20 7:31 ` Jean Delvare 2017-04-05 16:58 ` [PATCH 10/38] Annotate hardware config module parameters in drivers/iio/ David Howells 2017-04-05 16:58 ` David Howells 2017-04-05 16:58 ` [PATCH 11/38] Annotate hardware config module parameters in drivers/input/ David Howells 2017-04-05 16:58 ` David Howells 2017-04-05 16:58 ` [PATCH 12/38] Annotate hardware config module parameters in drivers/isdn/ David Howells 2017-04-05 16:58 ` David Howells 2017-04-05 16:58 ` [PATCH 13/38] Annotate hardware config module parameters in drivers/media/ David Howells 2017-04-05 16:58 ` David Howells 2017-04-19 11:09 ` Mauro Carvalho Chehab 2017-04-19 11:09 ` Mauro Carvalho Chehab 2017-04-05 16:58 ` [PATCH 14/38] Annotate hardware config module parameters in drivers/misc/ David Howells 2017-04-05 16:58 ` David Howells 2017-04-08 15:23 ` Greg KH 2017-04-08 15:23 ` Greg KH 2017-04-05 16:59 ` [PATCH 15/38] Annotate hardware config module parameters in drivers/mmc/host/ David Howells 2017-04-05 16:59 ` David Howells 2017-04-05 16:59 ` [PATCH 16/38] Annotate hardware config module parameters in drivers/net/appletalk/ David Howells 2017-04-05 16:59 ` David Howells 2017-04-05 16:59 ` [PATCH 17/38] Annotate hardware config module parameters in drivers/net/arcnet/ David Howells 2017-04-05 16:59 ` David Howells 2017-04-05 16:59 ` [PATCH 18/38] Annotate hardware config module parameters in drivers/net/can/ David Howells 2017-04-05 16:59 ` David Howells 2017-04-14 13:08 ` Marc Kleine-Budde 2017-04-14 13:08 ` Marc Kleine-Budde 2017-04-18 14:36 ` David Howells 2017-04-18 14:36 ` David Howells 2017-04-05 16:59 ` [PATCH 19/38] Annotate hardware config module parameters in drivers/net/ethernet/ David Howells 2017-04-05 16:59 ` David Howells 2017-04-05 16:59 ` [PATCH 20/38] Annotate hardware config module parameters in drivers/net/hamradio/ David Howells 2017-04-05 16:59 ` David Howells 2017-04-05 17:00 ` [PATCH 21/38] Annotate hardware config module parameters in drivers/net/irda/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:00 ` [PATCH 22/38] Annotate hardware config module parameters in drivers/net/wan/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:00 ` [PATCH 23/38] Annotate hardware config module parameters in drivers/net/wireless/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:00 ` [PATCH 24/38] Annotate hardware config module parameters in drivers/parport/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:00 ` [PATCH 25/38] Annotate hardware config module parameters in drivers/pci/hotplug/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:00 ` [PATCH 26/38] Annotate hardware config module parameters in drivers/pcmcia/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:00 ` [PATCH 27/38] Annotate hardware config module parameters in drivers/scsi/ David Howells 2017-04-05 17:00 ` David Howells 2017-04-05 17:01 ` [PATCH 28/38] Annotate hardware config module parameters in drivers/staging/media/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-08 15:23 ` Greg KH 2017-04-08 15:23 ` Greg KH 2017-04-19 11:08 ` Mauro Carvalho Chehab 2017-04-19 11:08 ` Mauro Carvalho Chehab 2017-04-05 17:01 ` [PATCH 29/38] Annotate hardware config module parameters in drivers/staging/speakup/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-08 15:23 ` Greg KH 2017-04-08 15:23 ` Greg KH 2017-04-05 17:01 ` [PATCH 30/38] Annotate hardware config module parameters in drivers/staging/vme/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-05 17:01 ` [PATCH 31/38] Annotate hardware config module parameters in drivers/tty/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-08 15:19 ` Greg KH 2017-04-08 15:19 ` Greg KH 2017-04-05 17:01 ` [PATCH 32/38] Annotate hardware config module parameters in drivers/video/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-05 17:01 ` David Howells [not found] ` <CGME20170414112713epcas5p218f3663e4f0ea4ca1bfaf4155d4724c8@epcas5p2.samsung.com> 2017-04-14 11:27 ` Bartlomiej Zolnierkiewicz 2017-04-14 11:27 ` Bartlomiej Zolnierkiewicz 2017-04-14 11:27 ` Bartlomiej Zolnierkiewicz 2017-04-05 17:01 ` [PATCH 33/38] Annotate hardware config module parameters in drivers/watchdog/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-05 17:01 ` [PATCH 34/38] Annotate hardware config module parameters in fs/pstore/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-05 17:04 ` Kees Cook 2017-04-05 17:04 ` Kees Cook 2017-04-05 17:01 ` [PATCH 35/38] Annotate hardware config module parameters in sound/drivers/ David Howells 2017-04-05 17:01 ` David Howells 2017-04-05 17:01 ` David Howells 2017-04-07 8:42 ` Takashi Iwai 2017-04-07 8:42 ` Takashi Iwai 2017-04-07 8:42 ` Takashi Iwai 2017-04-05 17:02 ` [PATCH 36/38] Annotate hardware config module parameters in sound/isa/ David Howells 2017-04-05 17:02 ` David Howells 2017-04-05 17:02 ` David Howells 2017-04-05 17:02 ` [PATCH 37/38] Annotate hardware config module parameters in sound/oss/ David Howells 2017-04-05 17:02 ` David Howells 2017-04-05 17:02 ` David Howells 2017-04-05 17:02 ` [PATCH 38/38] Annotate hardware config module parameters in sound/pci/ David Howells 2017-04-05 17:02 ` 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=149141147489.29162.566616944109123278.stgit@warthog.procyon.org.uk \ --to=dhowells@redhat.com \ --cc=gnomes@lxorguk.ukuu.org.uk \ --cc=gnurou@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=keyrings@vger.kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=vilhelm.gray@gmail.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.