From: Amit Pundir Date: Thu, 29 Oct 2015 19:17:53 +0000 (+0530) Subject: SELinux: build fix for 4.1 X-Git-Tag: firefly_0821_release~2958^2~139 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43e1b4f528e1654fadd1097f7cc5c50be6e45b77;p=firefly-linux-kernel-4.4.55.git SELinux: build fix for 4.1 Commit "SELinux: Enable setting security contexts on rootfs inodes." cherry-picked in experimental/android-4.1 used a now obsolete flag SE_SBLABELSUPP. Rename it to SBLABEL_MNT as intended by upstream commit 12f348b9dcf6 "SELinux: rename SE_SBLABELSUPP to SBLABEL_MNT", otherwise we run into following build error: CC security/selinux/hooks.o security/selinux/hooks.c: In function ‘sb_finish_set_opts’: security/selinux/hooks.c:459:19: error: ‘SE_SBLABELSUPP’ undeclared (first use in this function) sbsec->flags |= SE_SBLABELSUPP; ^ security/selinux/hooks.c:459:19: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [security/selinux/hooks.o] Error 1 Signed-off-by: Amit Pundir --- diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 0ff911a94757..7c22a15c7e4b 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -469,7 +469,7 @@ static int sb_finish_set_opts(struct super_block *sb) * setting SELinux context on in-core inodes. */ if (strncmp(sb->s_type->name, "rootfs", sizeof("rootfs")) == 0) - sbsec->flags |= SE_SBLABELSUPP; + sbsec->flags |= SBLABEL_MNT; /* Initialize the root inode. */ rc = inode_doinit_with_dentry(root_inode, root);