diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-20 14:11:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-20 14:11:02 +0100 |
| commit | ff3f532397486f967f5693d0e571241ec2e6c61b (patch) | |
| tree | c526d769d0ee84ad9395d700f7ac25856633ac84 /drivers/pcmcia | |
| parent | 35b5910629b990c20ba93e6efea2396fa5411f23 (diff) | |
| parent | 45893a0abee6b5fd52994a3a1095735aeaec472b (diff) | |
| download | linux-next-ff3f532397486f967f5693d0e571241ec2e6c61b.tar.gz | |
Merge remote-tracking branch 'security/next-testing'
# Conflicts:
# arch/s390/configs/debug_defconfig
# arch/s390/configs/defconfig
# arch/s390/configs/performance_defconfig
# kernel/trace/trace_kprobe.c
# security/integrity/ima/Kconfig
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/cistpl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index abd029945cc8..629359fe3513 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c @@ -21,6 +21,7 @@ #include <linux/pci.h> #include <linux/ioport.h> #include <linux/io.h> +#include <linux/security.h> #include <asm/byteorder.h> #include <asm/unaligned.h> @@ -1575,6 +1576,10 @@ static ssize_t pccard_store_cis(struct file *filp, struct kobject *kobj, struct pcmcia_socket *s; int error; + error = security_locked_down(LOCKDOWN_PCMCIA_CIS); + if (error) + return error; + s = to_socket(container_of(kobj, struct device, kobj)); if (off) |