android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Sync up with android11-5.4 for the following commits:

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

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5c3546d9d9a2216f2f81a86e2824fa2de9a6bd8c
This commit is contained in:
Greg Kroah-Hartman 2021-11-11 10:13:07 +01:00
commit 3197361248
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/android_kabi.h
View File

@ -63,7 +63,7 @@
_new; \
struct { \
_orig; \
} __UNIQUE_ID(android_kabi_hide); \
}; \
__ANDROID_KABI_CHECK_SIZE_ALIGN(_orig, _new); \
}

1
security/selinux/hooks.c
View File

@ -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;