Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c
index 351d3bab3a3d..62a3589c62ab 100644
--- a/security/apparmor/policy_ns.c
+++ b/security/apparmor/policy_ns.c
@@ -112,6 +112,8 @@ static struct aa_ns *alloc_ns(const char *prefix, const char *name)
         ns->unconfined->label.flags |= FLAG_IX_ON_NAME_ERROR |
                 FLAG_IMMUTIBLE | FLAG_NS_COUNT | FLAG_UNCONFINED;
         ns->unconfined->mode = APPARMOR_UNCONFINED;
+        ns->unconfined->file.dfa = aa_get_dfa(nulldfa);
+        ns->unconfined->policy.dfa = aa_get_dfa(nulldfa);
 
         /* ns and ns->unconfined share ns->unconfined refcount */
         ns->unconfined->ns = ns;