From: Greg Kroah-Hartman Date: Mon, 3 Jun 2019 09:01:18 +0000 (+0200) Subject: 5.0-stable patches X-Git-Tag: v5.1.7~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4b55a87c10a48e65a1fdefb64c03ff37eba4b5b;p=thirdparty%2Fkernel%2Fstable-queue.git 5.0-stable patches added patches: revert-tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch --- diff --git a/queue-5.0/revert-tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch b/queue-5.0/revert-tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch new file mode 100644 index 00000000000..edb2fe8c33d --- /dev/null +++ b/queue-5.0/revert-tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch @@ -0,0 +1,78 @@ +From 5593530e56943182ebb6d81eca8a3be6db6dbba4 Mon Sep 17 00:00:00 2001 +From: "David S. Miller" +Date: Fri, 17 May 2019 12:15:05 -0700 +Subject: Revert "tipc: fix modprobe tipc failed after switch order of device registration" + +From: David S. Miller + +commit 5593530e56943182ebb6d81eca8a3be6db6dbba4 upstream. + +This reverts commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e. + +More revisions coming up. + +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/tipc/core.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +--- a/net/tipc/core.c ++++ b/net/tipc/core.c +@@ -66,10 +66,6 @@ static int __net_init tipc_init_net(stru + INIT_LIST_HEAD(&tn->node_list); + spin_lock_init(&tn->node_list_lock); + +- err = tipc_socket_init(); +- if (err) +- goto out_socket; +- + err = tipc_sk_rht_init(net); + if (err) + goto out_sk_rht; +@@ -96,8 +92,6 @@ out_subscr: + out_nametbl: + tipc_sk_rht_destroy(net); + out_sk_rht: +- tipc_socket_stop(); +-out_socket: + return err; + } + +@@ -108,7 +102,6 @@ static void __net_exit tipc_exit_net(str + tipc_bcast_stop(net); + tipc_nametbl_stop(net); + tipc_sk_rht_destroy(net); +- tipc_socket_stop(); + } + + static struct pernet_operations tipc_net_ops = { +@@ -144,6 +137,10 @@ static int __init tipc_init(void) + if (err) + goto out_pernet; + ++ err = tipc_socket_init(); ++ if (err) ++ goto out_socket; ++ + err = tipc_bearer_setup(); + if (err) + goto out_bearer; +@@ -151,6 +148,8 @@ static int __init tipc_init(void) + pr_info("Started in single node mode\n"); + return 0; + out_bearer: ++ tipc_socket_stop(); ++out_socket: + unregister_pernet_subsys(&tipc_net_ops); + out_pernet: + tipc_unregister_sysctl(); +@@ -166,6 +165,7 @@ out_netlink: + static void __exit tipc_exit(void) + { + tipc_bearer_cleanup(); ++ tipc_socket_stop(); + unregister_pernet_subsys(&tipc_net_ops); + tipc_netlink_stop(); + tipc_netlink_compat_stop(); diff --git a/queue-5.0/series b/queue-5.0/series index f8febaf5374..ceedcb0804f 100644 --- a/queue-5.0/series +++ b/queue-5.0/series @@ -32,3 +32,5 @@ cxgb4-revert-cxgb4-remove-sge_host_page_size-dependency-on-page-size.patch net-correct-zerocopy-refcnt-with-udp-msg_more.patch crypto-vmx-ghash-do-nosimd-fallback-manually.patch xen-pciback-don-t-disable-pci_command-on-pci-device-reset.patch +revert-tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch +tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch diff --git a/queue-5.0/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch b/queue-5.0/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch new file mode 100644 index 00000000000..067dd753e34 --- /dev/null +++ b/queue-5.0/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch @@ -0,0 +1,161 @@ +From 526f5b851a96566803ee4bee60d0a34df56c77f8 Mon Sep 17 00:00:00 2001 +From: Junwei Hu +Date: Mon, 20 May 2019 14:43:59 +0800 +Subject: tipc: fix modprobe tipc failed after switch order of device registration + +From: Junwei Hu + +commit 526f5b851a96566803ee4bee60d0a34df56c77f8 upstream. + +Error message printed: +modprobe: ERROR: could not insert 'tipc': Address family not +supported by protocol. +when modprobe tipc after the following patch: switch order of +device registration, commit 7e27e8d6130c +("tipc: switch order of device registration to fix a crash") + +Because sock_create_kern(net, AF_TIPC, ...) called by +tipc_topsrv_create_listener() in the initialization process +of tipc_init_net(), so tipc_socket_init() must be execute before that. +Meanwhile, tipc_net_id need to be initialized when sock_create() +called, and tipc_socket_init() is no need to be called for each namespace. + +I add a variable tipc_topsrv_net_ops, and split the +register_pernet_subsys() of tipc into two parts, and split +tipc_socket_init() with initialization of pernet params. + +By the way, I fixed resources rollback error when tipc_bcast_init() +failed in tipc_init_net(). + +Fixes: 7e27e8d6130c ("tipc: switch order of device registration to fix a crash") +Signed-off-by: Junwei Hu +Reported-by: Wang Wang +Reported-by: syzbot+1e8114b61079bfe9cbc5@syzkaller.appspotmail.com +Reviewed-by: Kang Zhou +Reviewed-by: Suanming Mou +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/tipc/core.c | 18 ++++++++++++------ + net/tipc/subscr.h | 5 +++-- + net/tipc/topsrv.c | 14 ++++++++++++-- + 3 files changed, 27 insertions(+), 10 deletions(-) + +--- a/net/tipc/core.c ++++ b/net/tipc/core.c +@@ -75,9 +75,6 @@ static int __net_init tipc_init_net(stru + goto out_nametbl; + + INIT_LIST_HEAD(&tn->dist_queue); +- err = tipc_topsrv_start(net); +- if (err) +- goto out_subscr; + + err = tipc_bcast_init(net); + if (err) +@@ -86,8 +83,6 @@ static int __net_init tipc_init_net(stru + return 0; + + out_bclink: +- tipc_bcast_stop(net); +-out_subscr: + tipc_nametbl_stop(net); + out_nametbl: + tipc_sk_rht_destroy(net); +@@ -97,7 +92,6 @@ out_sk_rht: + + static void __net_exit tipc_exit_net(struct net *net) + { +- tipc_topsrv_stop(net); + tipc_net_stop(net); + tipc_bcast_stop(net); + tipc_nametbl_stop(net); +@@ -111,6 +105,11 @@ static struct pernet_operations tipc_net + .size = sizeof(struct tipc_net), + }; + ++static struct pernet_operations tipc_topsrv_net_ops = { ++ .init = tipc_topsrv_init_net, ++ .exit = tipc_topsrv_exit_net, ++}; ++ + static int __init tipc_init(void) + { + int err; +@@ -141,6 +140,10 @@ static int __init tipc_init(void) + if (err) + goto out_socket; + ++ err = register_pernet_subsys(&tipc_topsrv_net_ops); ++ if (err) ++ goto out_pernet_topsrv; ++ + err = tipc_bearer_setup(); + if (err) + goto out_bearer; +@@ -148,6 +151,8 @@ static int __init tipc_init(void) + pr_info("Started in single node mode\n"); + return 0; + out_bearer: ++ unregister_pernet_subsys(&tipc_topsrv_net_ops); ++out_pernet_topsrv: + tipc_socket_stop(); + out_socket: + unregister_pernet_subsys(&tipc_net_ops); +@@ -165,6 +170,7 @@ out_netlink: + static void __exit tipc_exit(void) + { + tipc_bearer_cleanup(); ++ unregister_pernet_subsys(&tipc_topsrv_net_ops); + tipc_socket_stop(); + unregister_pernet_subsys(&tipc_net_ops); + tipc_netlink_stop(); +--- a/net/tipc/subscr.h ++++ b/net/tipc/subscr.h +@@ -77,8 +77,9 @@ void tipc_sub_report_overlap(struct tipc + u32 found_lower, u32 found_upper, + u32 event, u32 port, u32 node, + u32 scope, int must); +-int tipc_topsrv_start(struct net *net); +-void tipc_topsrv_stop(struct net *net); ++ ++int __net_init tipc_topsrv_init_net(struct net *net); ++void __net_exit tipc_topsrv_exit_net(struct net *net); + + void tipc_sub_put(struct tipc_subscription *subscription); + void tipc_sub_get(struct tipc_subscription *subscription); +--- a/net/tipc/topsrv.c ++++ b/net/tipc/topsrv.c +@@ -637,7 +637,7 @@ static void tipc_topsrv_work_stop(struct + destroy_workqueue(s->send_wq); + } + +-int tipc_topsrv_start(struct net *net) ++static int tipc_topsrv_start(struct net *net) + { + struct tipc_net *tn = tipc_net(net); + const char name[] = "topology_server"; +@@ -671,7 +671,7 @@ int tipc_topsrv_start(struct net *net) + return ret; + } + +-void tipc_topsrv_stop(struct net *net) ++static void tipc_topsrv_stop(struct net *net) + { + struct tipc_topsrv *srv = tipc_topsrv(net); + struct socket *lsock = srv->listener; +@@ -696,3 +696,13 @@ void tipc_topsrv_stop(struct net *net) + idr_destroy(&srv->conn_idr); + kfree(srv); + } ++ ++int __net_init tipc_topsrv_init_net(struct net *net) ++{ ++ return tipc_topsrv_start(net); ++} ++ ++void __net_exit tipc_topsrv_exit_net(struct net *net) ++{ ++ tipc_topsrv_stop(net); ++}