forked from Minki/linux
291b38a756
-----BEGIN PGP SIGNATURE-----
iQIVAwUAWPiW6vSw1s6N8H32AQLOrw/+NTqGf7bjq+64YKS6NfR0XDgE+wNJltGO
ck7zJW3NHIg76RNu8s0I9xg5aVmwizz3Z5DGROZquaolnezux4tQihZ3AFyxIzLc
+Y3WHYagcML7yFfjl/WznCLRD5EW3yPln4lCvQO0nW/xICRYeRI057JaIbi2Dtek
BhcXt3c4AjXDLdYJkgtHV3p2R2mt8hcdFdWqqx6s7JaIThZNRGNzxAgtbcB9k5IW
HVG9ZEIL73VBYWHrYivzjHYF5rBnNCPt87eOwDQeTOSkhv8te+u9k+bH8vxZw1T0
XUtDrLBndKiuVo2GUfLkkF8LItx3Q9eLCJYy0joaIliyPqTEsPx9KjQ+Af0cxS9s
ZPCZ5SYf96stKmDeL5xaMfrAmeyVHJ4lc4JTOqdzbIT8blsOSfYO/03p0ALShSDv
/RQLaKGlf8Bjoy8PwKFcXb4sIDufcd/U1Av/EMFXxOfgN/u2JUkGKq6EaIM5B68L
fHPje+aR9VNELPmPjwNOWtmN4I79EH3EItQf7zv0KG+UeKhcHLx/EAcSJ3ZRKEkH
Lathg7pPOEJGArPiVO79TZzBG01ADn1aiwv65XObMzNZ+54xI/mN/Y1DNF/kL5jU
XzvNzEjFt8mwMIZGVNdAt4+pDyMfIZGZSyUkSRKFnaQZMIvQrfQIU9RLBYLX5eOx
+/p0VkIwDpg=
=lbS7
-----END PGP SIGNATURE-----
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull hw lockdown support from David Howells:
"Annotation of module parameters that configure hardware resources
including ioports, iomem addresses, irq lines and dma channels.
This allows a future patch to prohibit the use of such module
parameters to prevent that hardware from being abused to gain access
to the running kernel image as part of locking the kernel down under
UEFI secure boot conditions.
Annotations are made by changing:
module_param(n, t, p)
module_param_named(n, v, t, p)
module_param_array(n, t, m, p)
to:
module_param_hw(n, t, hwtype, p)
module_param_hw_named(n, v, t, hwtype, p)
module_param_hw_array(n, t, hwtype, m, p)
where the module parameter refers to a hardware setting
hwtype specifies the type of the resource being configured. This can
be one of:
ioport Module parameter configures an I/O port
iomem Module parameter configures an I/O mem address
ioport_or_iomem Module parameter could be either (runtime set)
irq Module parameter configures an I/O port
dma Module parameter configures a DMA channel
dma_addr Module parameter configures a DMA buffer address
other Module parameter configures some other value
Note that the hwtype is compile checked, but not currently stored (the
lockdown code probably won't require it). It is, however, there for
future use.
A bonus is that the hwtype can also be used for grepping.
The intention is for the kernel to ignore or reject attempts to set
annotated module parameters if lockdown is enabled. This applies to
options passed on the boot command line, passed to insmod/modprobe or
direct twiddling in /sys/module/ parameter files.
The module initialisation then needs to handle the parameter not being
set, by (1) giving an error, (2) probing for a value or (3) using a
reasonable default.
What I can't do is just reject a module out of hand because it may
take a hardware setting in the module parameters. Some important
modules, some ipmi stuff for instance, both probe for hardware and
allow hardware to be manually specified; if the driver is aborts with
any error, you don't get any ipmi hardware.
Further, trying to do this entirely in the module initialisation code
doesn't protect against sysfs twiddling.
[!] Note that in and of itself, this series of patches should have no
effect on the the size of the kernel or code execution - that is
left to a patch in the next series to effect. It does mark
annotated kernel parameters with a KERNEL_PARAM_FL_HWPARAM flag in
an already existing field"
* tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: (38 commits)
Annotate hardware config module parameters in sound/pci/
Annotate hardware config module parameters in sound/oss/
Annotate hardware config module parameters in sound/isa/
Annotate hardware config module parameters in sound/drivers/
Annotate hardware config module parameters in fs/pstore/
Annotate hardware config module parameters in drivers/watchdog/
Annotate hardware config module parameters in drivers/video/
Annotate hardware config module parameters in drivers/tty/
Annotate hardware config module parameters in drivers/staging/vme/
Annotate hardware config module parameters in drivers/staging/speakup/
Annotate hardware config module parameters in drivers/staging/media/
Annotate hardware config module parameters in drivers/scsi/
Annotate hardware config module parameters in drivers/pcmcia/
Annotate hardware config module parameters in drivers/pci/hotplug/
Annotate hardware config module parameters in drivers/parport/
Annotate hardware config module parameters in drivers/net/wireless/
Annotate hardware config module parameters in drivers/net/wan/
Annotate hardware config module parameters in drivers/net/irda/
Annotate hardware config module parameters in drivers/net/hamradio/
Annotate hardware config module parameters in drivers/net/ethernet/
...
|
||
|---|---|---|
| .. | ||
| acquirewdt.c | ||
| advantechwdt.c | ||
| alim1535_wdt.c | ||
| alim7101_wdt.c | ||
| ar7_wdt.c | ||
| asm9260_wdt.c | ||
| aspeed_wdt.c | ||
| at32ap700x_wdt.c | ||
| at91rm9200_wdt.c | ||
| at91sam9_wdt.c | ||
| at91sam9_wdt.h | ||
| ath79_wdt.c | ||
| atlas7_wdt.c | ||
| bcm47xx_wdt.c | ||
| bcm63xx_wdt.c | ||
| bcm2835_wdt.c | ||
| bcm7038_wdt.c | ||
| bcm_kona_wdt.c | ||
| bfin_wdt.c | ||
| booke_wdt.c | ||
| cadence_wdt.c | ||
| coh901327_wdt.c | ||
| cpu5wdt.c | ||
| cpwd.c | ||
| da9052_wdt.c | ||
| da9055_wdt.c | ||
| da9062_wdt.c | ||
| da9063_wdt.c | ||
| davinci_wdt.c | ||
| diag288_wdt.c | ||
| digicolor_wdt.c | ||
| dw_wdt.c | ||
| ebc-c384_wdt.c | ||
| ep93xx_wdt.c | ||
| eurotechwdt.c | ||
| f71808e_wdt.c | ||
| gef_wdt.c | ||
| gemini_wdt.c | ||
| geodewdt.c | ||
| gpio_wdt.c | ||
| hpwdt.c | ||
| i6300esb.c | ||
| ib700wdt.c | ||
| ibmasr.c | ||
| ie6xx_wdt.c | ||
| imgpdc_wdt.c | ||
| imx2_wdt.c | ||
| indydog.c | ||
| intel_scu_watchdog.c | ||
| intel_scu_watchdog.h | ||
| intel-mid_wdt.c | ||
| iop_wdt.c | ||
| it87_wdt.c | ||
| it8712f_wdt.c | ||
| iTCO_vendor_support.c | ||
| iTCO_vendor.h | ||
| iTCO_wdt.c | ||
| ixp4xx_wdt.c | ||
| jz4740_wdt.c | ||
| Kconfig | ||
| kempld_wdt.c | ||
| ks8695_wdt.c | ||
| lantiq_wdt.c | ||
| loongson1_wdt.c | ||
| lpc18xx_wdt.c | ||
| m54xx_wdt.c | ||
| machzwd.c | ||
| Makefile | ||
| max63xx_wdt.c | ||
| max77620_wdt.c | ||
| mei_wdt.c | ||
| mena21_wdt.c | ||
| menf21bmc_wdt.c | ||
| meson_gxbb_wdt.c | ||
| meson_wdt.c | ||
| mixcomwd.c | ||
| moxart_wdt.c | ||
| mpc8xxx_wdt.c | ||
| mt7621_wdt.c | ||
| mtk_wdt.c | ||
| mtx-1_wdt.c | ||
| mv64x60_wdt.c | ||
| ni903x_wdt.c | ||
| nic7018_wdt.c | ||
| nuc900_wdt.c | ||
| nv_tco.c | ||
| nv_tco.h | ||
| octeon-wdt-main.c | ||
| octeon-wdt-nmi.S | ||
| of_xilinx_wdt.c | ||
| omap_wdt.c | ||
| omap_wdt.h | ||
| orion_wdt.c | ||
| pc87413_wdt.c | ||
| pcwd_pci.c | ||
| pcwd_usb.c | ||
| pcwd.c | ||
| pic32-dmt.c | ||
| pic32-wdt.c | ||
| pika_wdt.c | ||
| pnx833x_wdt.c | ||
| pnx4008_wdt.c | ||
| pretimeout_noop.c | ||
| pretimeout_panic.c | ||
| qcom-wdt.c | ||
| rc32434_wdt.c | ||
| rdc321x_wdt.c | ||
| renesas_wdt.c | ||
| retu_wdt.c | ||
| riowd.c | ||
| rn5t618_wdt.c | ||
| rt2880_wdt.c | ||
| s3c2410_wdt.c | ||
| sa1100_wdt.c | ||
| sama5d4_wdt.c | ||
| sb_wdog.c | ||
| sbc60xxwdt.c | ||
| sbc7240_wdt.c | ||
| sbc8360.c | ||
| sbc_epx_c3.c | ||
| sbc_fitpc2_wdt.c | ||
| sbsa_gwdt.c | ||
| sc520_wdt.c | ||
| sc1200wdt.c | ||
| sch311x_wdt.c | ||
| scx200_wdt.c | ||
| shwdt.c | ||
| sirfsoc_wdt.c | ||
| smsc37b787_wdt.c | ||
| softdog.c | ||
| sp805_wdt.c | ||
| sp5100_tco.c | ||
| sp5100_tco.h | ||
| st_lpc_wdt.c | ||
| stmp3xxx_rtc_wdt.c | ||
| sun4v_wdt.c | ||
| sunxi_wdt.c | ||
| tangox_wdt.c | ||
| tegra_wdt.c | ||
| ts72xx_wdt.c | ||
| ts4800_wdt.c | ||
| twl4030_wdt.c | ||
| txx9wdt.c | ||
| ux500_wdt.c | ||
| via_wdt.c | ||
| w83627hf_wdt.c | ||
| w83877f_wdt.c | ||
| w83977f_wdt.c | ||
| wafer5823wdt.c | ||
| watchdog_core.c | ||
| watchdog_core.h | ||
| watchdog_dev.c | ||
| watchdog_pretimeout.c | ||
| watchdog_pretimeout.h | ||
| wd501p.h | ||
| wdat_wdt.c | ||
| wdrtas.c | ||
| wdt285.c | ||
| wdt977.c | ||
| wdt_pci.c | ||
| wdt.c | ||
| wm831x_wdt.c | ||
| wm8350_wdt.c | ||
| xen_wdt.c | ||
| ziirave_wdt.c | ||
| zx2967_wdt.c | ||