debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

lockdown: Update calls to kernel_is_locked_down() in "mtd: Disable slram and phram when locked down" 

We need to pass a string to be logged the first time the check fires.
This commit is contained in:
Ben Hutchings 2017-12-26 22:29:05 +00:00
parent 7dd9b58675
commit 7bcd3c4d13
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ linux (4.15~rc5-1~exp1) UNRELEASED; urgency=medium
[ Ben Hutchings ]
* aufs: Update support patchset to aufs4.x-rcN-20171218
* lockdown: Update patchset to 2017-11-10 version
* lockdown: Update calls to kernel_is_locked_down() in "mtd: Disable slram and
phram when locked down"
-- Ben Hutchings <ben@decadent.org.uk> Tue, 26 Dec 2017 16:25:55 +0000

6
debian/patches/features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch vendored
View File

@ -17,7 +17,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
uint64_t len;
int i, ret;
+ if (kernel_is_locked_down())
+ if (kernel_is_locked_down("Command line-specified device addresses"))
+ return -EPERM;
+
if (strnlen(val, sizeof(buf)) >= sizeof(buf))
@ -25,11 +25,11 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -230,6 +230,9 @@ static int parse_cmdline(char *devname,
@@ -231,6 +231,9 @@ static int parse_cmdline(char *devname,
unsigned long devstart;
unsigned long devlength;
+ if (kernel_is_locked_down())
+ if (kernel_is_locked_down("Command line-specified device addresses"))
+ return -EPERM;
+
if ((!devname) || (!szstart) || (!szlength)) {