Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-02-14 18:06:42 +0100
committerMichal Kubecek <mkubecek@suse.cz>2019-02-14 18:06:42 +0100
commitfba27e2a78f08d94ce19c33e2942902acc037b55 (patch)
tree1af9691dae020e8f17f381fe197231870452748c
parent0d1872e0ba54072153fc764cdd8a61efc0209c9a (diff)
kabi: handle addition of uevent_sock into struct net
(bsc#1122982).
-rw-r--r--patches.kabi/kabi-handle-addition-of-uevent_sock-into-struct-net.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.kabi/kabi-handle-addition-of-uevent_sock-into-struct-net.patch b/patches.kabi/kabi-handle-addition-of-uevent_sock-into-struct-net.patch
new file mode 100644
index 0000000000..5081b74479
--- /dev/null
+++ b/patches.kabi/kabi-handle-addition-of-uevent_sock-into-struct-net.patch
@@ -0,0 +1,35 @@
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Thu, 14 Feb 2019 13:30:26 +0100
+Subject: kabi: handle addition of uevent_sock into struct net
+Patch-mainline: Never, kabi workaround
+References: bsc#1122982
+
+Backport of mainline commit 94e5e3087a67 ("net: add uevent socket member")
+adds uevent_sock member into struct net. Move this new member at the end of
+the structure and hide it from genksyms. This is safe as struct net should
+never be allocated directly or embedded in other structure or array.
+
+Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
+---
+ include/net/net_namespace.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/include/net/net_namespace.h
++++ b/include/net/net_namespace.h
+@@ -77,8 +77,6 @@ struct net {
+ struct sock *rtnl; /* rtnetlink socket */
+ struct sock *genl_sock;
+
+- struct uevent_sock *uevent_sock; /* uevent socket */
+-
+ struct list_head dev_base_head;
+ struct hlist_head *dev_name_head;
+ struct hlist_head *dev_index_head;
+@@ -155,6 +153,7 @@ struct net {
+ spinlock_t lock;
+ u32 seq;
+ } ip6addrlbl_table;
++ struct uevent_sock *uevent_sock; /* uevent socket */
+ #endif
+ };
+
diff --git a/series.conf b/series.conf
index fc5e329edd..5254fad0f7 100644
--- a/series.conf
+++ b/series.conf
@@ -20722,6 +20722,7 @@
patches.fixes/irda-Only-insert-new-objects-into-the-global-databas.patch
patches.kabi/kabi-handle-addition-of-ip6addrlbl_table-into-struct.patch
patches.kabi/kabi-restore-ip_tunnel_delete_net.patch
+ patches.kabi/kabi-handle-addition-of-uevent_sock-into-struct-net.patch
########################################################
# Netfilter