Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31973612 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

bfb2ce3e ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE()
937e6e41 UPSTREAM: security: selinux: allow per-file labeling for bpffs

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I5c3546d9d9a2216f2f81a86e2824fa2de9a6bd8c
parents 7cd388ba bfb2ce3e

include/linux/android_kabi.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
		_new;						\

		struct {					\

			_orig;					\

		} __UNIQUE_ID(android_kabi_hide);		\

		};						\

		__ANDROID_KABI_CHECK_SIZE_ALIGN(_orig, _new);	\

	}

security/selinux/hooks.c

+1 −0
Original line number Diff line number Diff line
@@ -754,6 +754,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, 
	if (!strcmp(sb->s_type->name, "debugfs") ||

	    !strcmp(sb->s_type->name, "tracefs") ||

	    !strcmp(sb->s_type->name, "binder") ||

	    !strcmp(sb->s_type->name, "bpf") ||

	    !strcmp(sb->s_type->name, "pstore"))

		sbsec->flags |= SE_SBGENFS;