Merge tag 'v3.15' into next

Linux 3.15

1 files changed, 5 insertions, 2 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index b03b0776955a..336f0a04450e 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -106,7 +106,7 @@ int selinux_enforcing;
 static int __init enforcing_setup(char *str)
 {
         unsigned long enforcing;
-        if (!strict_strtoul(str, 0, &enforcing))
+        if (!kstrtoul(str, 0, &enforcing))
                 selinux_enforcing = enforcing ? 1 : 0;
         return 1;
 }
@@ -119,7 +119,7 @@ int selinux_enabled = CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE;
 static int __init selinux_enabled_setup(char *str)
 {
         unsigned long enabled;
-        if (!strict_strtoul(str, 0, &enabled))
+        if (!kstrtoul(str, 0, &enabled))
                 selinux_enabled = enabled ? 1 : 0;
         return 1;
 }
@@ -3320,6 +3320,9 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd,
         case F_GETLK:
         case F_SETLK:
         case F_SETLKW:
+        case F_OFD_GETLK:
+        case F_OFD_SETLK:
+        case F_OFD_SETLKW:
 #if BITS_PER_LONG == 32
         case F_GETLK64:
         case F_SETLK64: