Commit e0b884a0 authored Mar 10, 2020 by Greg Kroah-Hartman

ANDROID: GKI: sock.h: add Android ABI padding to some structures



Try to mitigate potential future driver core api changes by adding a
padding to struct sock.

Based on a patch from Michal Marek <mmarek@suse.cz> from the SLES kernel

Leaf changes summary: 1 artifact changed
Changed leaf types summary: 1 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

'struct sock at sock.h:324:1' changed:
  type size changed from 6016 to 6528 (in bits)
  8 data member insertions:
    'u64 sock::android_kabi_reserved1', at offset 6016 (in bits) at sock.h:516:1
    'u64 sock::android_kabi_reserved2', at offset 6080 (in bits) at sock.h:517:1
    'u64 sock::android_kabi_reserved3', at offset 6144 (in bits) at sock.h:518:1
    'u64 sock::android_kabi_reserved4', at offset 6208 (in bits) at sock.h:519:1
    'u64 sock::android_kabi_reserved5', at offset 6272 (in bits) at sock.h:520:1
    'u64 sock::android_kabi_reserved6', at offset 6336 (in bits) at sock.h:521:1
    'u64 sock::android_kabi_reserved7', at offset 6400 (in bits) at sock.h:522:1
    'u64 sock::android_kabi_reserved8', at offset 6464 (in bits) at sock.h:523:1

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I61c3d6cf12c087345db71fc6d93ee6bd58969003

parent fe54c238

abi_gki_aarch64.xml

+13743 −13788

File changed.

Preview size limit exceeded, changes collapsed.

include/net/sock.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@
		#include <linux/net_tstamp.h>
		#include <net/smc.h>
		#include <net/l3mdev.h>
		#include <linux/android_kabi.h>

		/*
		* This structure really needs to be cleaned up.
		@@ -511,6 +512,15 @@ struct sock {
		struct bpf_sk_storage __rcu *sk_bpf_storage;
		#endif
		struct rcu_head sk_rcu;

		ANDROID_KABI_RESERVE(1);
		ANDROID_KABI_RESERVE(2);
		ANDROID_KABI_RESERVE(3);
		ANDROID_KABI_RESERVE(4);
		ANDROID_KABI_RESERVE(5);
		ANDROID_KABI_RESERVE(6);
		ANDROID_KABI_RESERVE(7);
		ANDROID_KABI_RESERVE(8);
		};

		enum sk_pacing {