[linux] 02/07: lockdown: Update calls to kernel_is_locked_down() in "mtd: Disable slram and phram when locked down"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 7bcd3c4d13233a80b2c0c0209671d815e7bfb5c1
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Dec 26 22:29:05 2017 +0000

    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.
---
 debian/changelog                                                    | 2 ++
 .../all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af37f24..ce8c9b5 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 <ben at decadent.org.uk>  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 f7f9bb9..7a7f465 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 <ben at 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 at 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)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git