samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: af_unix: Provide ABI fixes for recently introduced 'struct scm_fp_list' attribute 'dead'

Browse Source 
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: If926b8a8bbf293304bbeb7cba66cafe158381fa6
This commit is contained in:
Lee Jones
2025-06-19 11:20:35 +01:00
parent ddd6979a15
commit fbd783363d
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/abi_gki_aarch64.stg
View File

@@ -76378,6 +76378,12 @@ member {
type_id: 0x6d7f5ff6 type_id: 0x6d7f5ff6
offset: 3200 offset: 3200
} }
member {
id: 0x3bde3edb
name: "dead"
type_id: 0x6d7f5ff6
offset: 16328
}
member { member {
id: 0x6491a5c4 id: 0x6491a5c4
name: "dead" name: "dead"
@@ -267019,6 +267025,7 @@ struct_union {
member_id: 0x042a2402 member_id: 0x042a2402
member_id: 0x5449f846 member_id: 0x5449f846
member_id: 0x799ec517 member_id: 0x799ec517
member_id: 0x3bde3edb
member_id: 0x7b11d1cc member_id: 0x7b11d1cc
member_id: 0x76d74733 member_id: 0x76d74733
member_id: 0x11d6bda9 member_id: 0x11d6bda9

3
android/abi_gki_aarch64.stg.allowed_breaks
View File

@@ -210,3 +210,6 @@ type 'struct scm_stat' changed
byte size changed from 4 to 16 byte size changed from 4 to 16
member 'unsigned long nr_unix_fds' was added member 'unsigned long nr_unix_fds' was added
type 'struct scm_fp_list' changed
member 'bool dead' was added

4
include/net/scm.h
View File

@@ -29,14 +29,12 @@ struct unix_edge;
struct scm_fp_list { struct scm_fp_list {
short count; short count;
short max; short max;
#ifdef CONFIG_UNIX
bool dead;
#endif
struct user_struct *user; struct user_struct *user;
struct file *fp[SCM_MAX_FD]; struct file *fp[SCM_MAX_FD];
#ifndef __GENKSYMS__ #ifndef __GENKSYMS__
#ifdef CONFIG_UNIX #ifdef CONFIG_UNIX
bool inflight; bool inflight;
bool dead;
struct list_head vertices; struct list_head vertices;
struct unix_edge *edges; struct unix_edge *edges;
#endif #endif