ANDROID: GKI: dentry: add Android ABI padding to some structures
Try to mitigate potential future driver core api changes by adding a padding to struct dentry and struct dentry_operations. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Idde3c6e99bd4af3a91ba115b8ec148e3e1cdd4a9
This commit is contained in:

committed by
Todd Kjos

parent
b9081a2925
commit
48cddc7c42
@@ -13,6 +13,7 @@
|
|||||||
#include <linux/lockref.h>
|
#include <linux/lockref.h>
|
||||||
#include <linux/stringhash.h>
|
#include <linux/stringhash.h>
|
||||||
#include <linux/wait.h>
|
#include <linux/wait.h>
|
||||||
|
#include <linux/android_kabi.h>
|
||||||
|
|
||||||
struct path;
|
struct path;
|
||||||
struct vfsmount;
|
struct vfsmount;
|
||||||
@@ -118,6 +119,9 @@ struct dentry {
|
|||||||
struct hlist_bl_node d_in_lookup_hash; /* only for in-lookup ones */
|
struct hlist_bl_node d_in_lookup_hash; /* only for in-lookup ones */
|
||||||
struct rcu_head d_rcu;
|
struct rcu_head d_rcu;
|
||||||
} d_u;
|
} d_u;
|
||||||
|
|
||||||
|
ANDROID_KABI_RESERVE(1);
|
||||||
|
ANDROID_KABI_RESERVE(2);
|
||||||
} __randomize_layout;
|
} __randomize_layout;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -148,6 +152,10 @@ struct dentry_operations {
|
|||||||
int (*d_manage)(const struct path *, bool);
|
int (*d_manage)(const struct path *, bool);
|
||||||
struct dentry *(*d_real)(struct dentry *, const struct inode *);
|
struct dentry *(*d_real)(struct dentry *, const struct inode *);
|
||||||
void (*d_canonical_path)(const struct path *, struct path *);
|
void (*d_canonical_path)(const struct path *, struct path *);
|
||||||
|
ANDROID_KABI_RESERVE(1);
|
||||||
|
ANDROID_KABI_RESERVE(2);
|
||||||
|
ANDROID_KABI_RESERVE(3);
|
||||||
|
ANDROID_KABI_RESERVE(4);
|
||||||
} ____cacheline_aligned;
|
} ____cacheline_aligned;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user