shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure

Browse Source 
Try to mitigate potential future driver core api changes by adding a
padding to struct user_namespace.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2c41281b191cd252db2ddc792699d869ce8d7a4d
This commit is contained in:
Greg Kroah-Hartman
2020-05-02 09:44:10 +02:00
committed by Carlos Llamas
parent ad192a1c1c
commit cb27de5e20
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/user_namespace.h
View File

@@ -10,6 +10,7 @@
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/android_kabi.h>
#define UID_GID_MAP_MAX_BASE_EXTENTS 5 #define UID_GID_MAP_MAX_BASE_EXTENTS 5
#define UID_GID_MAP_MAX_EXTENTS 340 #define UID_GID_MAP_MAX_EXTENTS 340
@@ -102,6 +103,9 @@ struct user_namespace {
struct ucounts *ucounts; struct ucounts *ucounts;
long ucount_max[UCOUNT_COUNTS]; long ucount_max[UCOUNT_COUNTS];
long rlimit_max[UCOUNT_RLIMIT_COUNTS]; long rlimit_max[UCOUNT_RLIMIT_COUNTS];
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
} __randomize_layout; } __randomize_layout;
struct ucounts { struct ucounts {