ANDROID: af_unix: Provide ABI fixes for recently introduced 'struct scm_fp_list' attribute 'vertices'
Adding new attributes to the ABI protected 'struct scm_fp_list' changes the offsets of the fields already present in the structure which could cause issues if modules already have a copy and are unaware of the changes. Let's add it to the end of the structure, under the protection of __GENKSYMS__ as is SOP. Bug: 404256079 Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ic7626478abc3842e603fdf5cdfdf006858377075
This commit is contained in:
@@ -71070,10 +71070,10 @@ member {
|
||||
type_id: 0x0484940b
|
||||
}
|
||||
member {
|
||||
id: 0x11d6bf1f
|
||||
id: 0x11d6b697
|
||||
name: "count_unix"
|
||||
type_id: 0xb0312d5a
|
||||
offset: 16320
|
||||
offset: 16448
|
||||
}
|
||||
member {
|
||||
id: 0x20014498
|
||||
@@ -212532,6 +212532,12 @@ member {
|
||||
type_id: 0xe8034002
|
||||
offset: 16
|
||||
}
|
||||
member {
|
||||
id: 0x7b11d7cc
|
||||
name: "vertices"
|
||||
type_id: 0xd3c80119
|
||||
offset: 16320
|
||||
}
|
||||
member {
|
||||
id: 0x444fc004
|
||||
name: "vet_description"
|
||||
@@ -266814,12 +266820,13 @@ struct_union {
|
||||
kind: STRUCT
|
||||
name: "scm_fp_list"
|
||||
definition {
|
||||
bytesize: 2048
|
||||
bytesize: 2064
|
||||
member_id: 0x65956ee9
|
||||
member_id: 0x97463852
|
||||
member_id: 0x042a2402
|
||||
member_id: 0x5449f846
|
||||
member_id: 0x11d6bf1f
|
||||
member_id: 0x7b11d7cc
|
||||
member_id: 0x11d6b697
|
||||
}
|
||||
}
|
||||
struct_union {
|
||||
|
@@ -144,3 +144,10 @@ type 'struct kvm_hyp_req' changed
|
||||
type 'struct scm_fp_list' changed
|
||||
byte size changed from 2040 to 2048
|
||||
member 'short count_unix' was added
|
||||
|
||||
type 'struct scm_fp_list' changed
|
||||
byte size changed from 2048 to 2064
|
||||
member 'struct list_head vertices' was added
|
||||
member 'short count_unix' changed
|
||||
offset changed by 128
|
||||
|
||||
|
@@ -25,12 +25,12 @@ struct scm_creds {
|
||||
struct scm_fp_list {
|
||||
short count;
|
||||
short max;
|
||||
#ifdef CONFIG_UNIX
|
||||
struct list_head vertices;
|
||||
#endif
|
||||
struct user_struct *user;
|
||||
struct file *fp[SCM_MAX_FD];
|
||||
#ifndef __GENKSYMS__
|
||||
#ifdef CONFIG_UNIX
|
||||
struct list_head vertices;
|
||||
#endif
|
||||
short count_unix;
|
||||
#endif
|
||||
};
|
||||
|
Reference in New Issue
Block a user