diff --git a/debian/changelog b/debian/changelog index af37f246a..ce8c9b5d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 26 Dec 2017 16:25:55 +0000 diff --git a/debian/patches/features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch b/debian/patches/features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch index f7f9bb9e8..7a7f46580 100644 --- a/debian/patches/features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch +++ b/debian/patches/features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch @@ -17,7 +17,7 @@ Signed-off-by: Ben Hutchings 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 --- 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)) {