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

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

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



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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I2c41281b191cd252db2ddc792699d869ce8d7a4d
parent 752f5439

include/linux/user_namespace.h

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/rwsem.h>

#include <linux/sysctl.h>

#include <linux/err.h>

#include <linux/android_kabi.h>



#define UID_GID_MAP_MAX_BASE_EXTENTS 5

#define UID_GID_MAP_MAX_EXTENTS 340
@@ -76,6 +77,9 @@ struct user_namespace { 
#endif

	struct ucounts		*ucounts;

	int ucount_max[UCOUNT_COUNTS];



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

} __randomize_layout;



struct ucounts {