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

ANDROID: GKI: fix ABI breakage in struct ipv6_devconf

Browse Source 
The following list of commits, which are in the 6.1.57 release, add a
new field in struct ipv6_devconf and this breaks the abi. Fix this by
using one of the reserved slots for upstream changes and update the stg
file to preserve the build.

  b691264274 ("net: release reference to inet6_dev pointer")
  bad004c384 ("net: change accept_ra_min_rtr_lft to affect all RA lifetimes")
  ec4162bb70 ("net: add sysctl accept_ra_min_rtr_lft")

type 'struct ipv6_devconf' changed
  member 'union { struct { __s32 accept_ra_min_lft; u32 padding; }; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

Bug: 320243175
Change-Id: Icddcad574f3c29f6d3e63b10f8c7e51bdf46fe7f
Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
Carlos Llamas 2024-02-07 22:17:44 +00:00
parent 20131b787f
commit 81c922621d
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
android/abi_gki_aarch64.stg
View File

@ -39374,6 +39374,10 @@ member {
id: 0x2e1fd5ab id: 0x2e1fd5ab
type_id: 0x375126bc type_id: 0x375126bc
} }
member {
id: 0x2e3fb8e1
type_id: 0x37d09395
}
member { member {
id: 0x2e407ff3 id: 0x2e407ff3
type_id: 0x362f8fdc type_id: 0x362f8fdc
@ -39910,6 +39914,11 @@ member {
type_id: 0x5d131624 type_id: 0x5d131624
offset: 64 offset: 64
} }
member {
id: 0x3494a41f
type_id: 0x5d7cfe67
offset: 2048
}
member { member {
id: 0x349c23b4 id: 0x349c23b4
type_id: 0x5d5ed2a3 type_id: 0x5d5ed2a3
@ -42829,6 +42838,11 @@ member {
type_id: 0x0faae5b1 type_id: 0x0faae5b1
offset: 704 offset: 704
} }
member {
id: 0xbe977230
name: "accept_ra_min_lft"
type_id: 0x0faae5b1
}
member { member {
id: 0x2c2f941d id: 0x2c2f941d
name: "accept_ra_mtu" name: "accept_ra_mtu"
@ -212488,6 +212502,15 @@ struct_union {
member_id: 0xd72d8bb2 member_id: 0xd72d8bb2
} }
} }
struct_union {
id: 0x37d09395
kind: STRUCT
definition {
bytesize: 8
member_id: 0xbe977230
member_id: 0x642f0821
}
}
struct_union { struct_union {
id: 0x37f08244 id: 0x37f08244
kind: STRUCT kind: STRUCT
@ -214385,6 +214408,16 @@ struct_union {
member_id: 0x8c9fd173 member_id: 0x8c9fd173
} }
} }
struct_union {
id: 0x5d7cfe67
kind: UNION
definition {
bytesize: 8
member_id: 0x2e3fb8e1
member_id: 0x27000c61
member_id: 0x36752b74
}
}
struct_union { struct_union {
id: 0x5d86aa37 id: 0x5d86aa37
kind: UNION kind: UNION
@ -237987,7 +238020,7 @@ struct_union {
member_id: 0xef330e54 member_id: 0xef330e54
member_id: 0xb7f742d4 member_id: 0xb7f742d4
member_id: 0x04607474 member_id: 0x04607474
member_id: 0x2d0812b0 member_id: 0x3494a41f
member_id: 0x637607e0 member_id: 0x637607e0
member_id: 0xac894cc9 member_id: 0xac894cc9
member_id: 0xe0f63db8 member_id: 0xe0f63db8

4
include/linux/ipv6.h
View File

@ -34,7 +34,6 @@ struct ipv6_devconf {
__s32 accept_ra_defrtr; __s32 accept_ra_defrtr;
__u32 ra_defrtr_metric; __u32 ra_defrtr_metric;
__s32 accept_ra_min_hop_limit; __s32 accept_ra_min_hop_limit;
__s32 accept_ra_min_lft;
__s32 accept_ra_pinfo; __s32 accept_ra_pinfo;
__s32 ignore_routes_with_linkdown; __s32 ignore_routes_with_linkdown;
#ifdef CONFIG_IPV6_ROUTER_PREF #ifdef CONFIG_IPV6_ROUTER_PREF
@ -87,7 +86,8 @@ struct ipv6_devconf {
struct ctl_table_header *sysctl_header; struct ctl_table_header *sysctl_header;
ANDROID_KABI_RESERVE(1); ANDROID_KABI_USE(1, struct { __s32 accept_ra_min_lft; u32 padding; });
ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3); ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4); ANDROID_KABI_RESERVE(4);