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

ANDROID: fix up struct sk_buf ABI breakage



In commit 6c2de0ef ("UPSTREAM: io_uring/af_unix: defer registered
files gc to io_uring release"), a new field is added to struct sk_buf.
We need that new field to resolve real problems, so move it to the
padded area that we had reserved for these types of issues.

Update the .xml file to handle the change in fields for the padding
structure, which is an abi-safe change:

type 'struct sk_buff' changed
  member 'union { struct { __u8 scm_io_uring; __u8 android_kabi_reserved1_padding1; __u16 android_kabi_reserved1_padding2; __u32 android_kabi_reserved1_padding3; }; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

Bug: 161946584
Bug: 268174392
Fixes: 6c2de0ef ("UPSTREAM: io_uring/af_unix: defer registered files gc to io_uring release")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9f99d85c95d78c688c4c9e88562863a1795e7b3a
parent 6c2de0ef
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment