Merge tag 'v5.0-rc3' into next-general
authorJames Morris <james.morris@microsoft.com>
Tue, 22 Jan 2019 22:33:10 +0000 (14:33 -0800)
committerJames Morris <james.morris@microsoft.com>
Tue, 22 Jan 2019 22:33:10 +0000 (14:33 -0800)
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.

1  2 
kernel/seccomp.c
security/security.c
security/yama/yama_lsm.c

Simple merge
@@@ -1472,10 -1027,14 +1472,17 @@@ int security_cred_alloc_blank(struct cr
  
  void security_cred_free(struct cred *cred)
  {
+       /*
+        * There is a failure case in prepare_creds() that
+        * may result in a call here with ->security being NULL.
+        */
+       if (unlikely(cred->security == NULL))
+               return;
        call_void_hook(cred_free, cred);
 +
 +      kfree(cred->security);
 +      cred->security = NULL;
  }
  
  int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp)
Simple merge