Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e

Authored by Junwei Hu
Committed by David S. Miller
1 parent 38a04b83ab

tipc: fix modprobe tipc failed after switch order of device registration 

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, ...) is called by
tipc_topsrv_create_listener() in the initialization process
of tipc_net_ops, tipc_socket_init() must be execute before that.

I move tipc_socket_init() into function tipc_init_net().

Fixes: 7e27e8d6130c
("tipc: switch order of device registration to fix a crash")
Signed-off-by: Junwei Hu <hujunwei4@huawei.com>
Reported-by: Wang Wang <wangwang2@huawei.com>
Reviewed-by: Kang Zhou <zhoukang7@huawei.com>
Reviewed-by: Suanming Mou <mousuanming@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 7 additions and 7 deletions Inline Diff

1 /* 1 /*
2 * net/tipc/core.c: TIPC module code 2 * net/tipc/core.c: TIPC module code
3 * 3 *
4 * Copyright (c) 2003-2006, 2013, Ericsson AB 4 * Copyright (c) 2003-2006, 2013, Ericsson AB
5 * Copyright (c) 2005-2006, 2010-2013, Wind River Systems 5 * Copyright (c) 2005-2006, 2010-2013, Wind River Systems
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions are met: 9 * modification, are permitted provided that the following conditions are met:
10 * 10 *
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 3. Neither the names of the copyright holders nor the names of its 16 * 3. Neither the names of the copyright holders nor the names of its
17 * contributors may be used to endorse or promote products derived from 17 * contributors may be used to endorse or promote products derived from
18 * this software without specific prior written permission. 18 * this software without specific prior written permission.
19 * 19 *
20 * Alternatively, this software may be distributed under the terms of the 20 * Alternatively, this software may be distributed under the terms of the
21 * GNU General Public License ("GPL") version 2 as published by the Free 21 * GNU General Public License ("GPL") version 2 as published by the Free
22 * Software Foundation. 22 * Software Foundation.
23 * 23 *
24 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 24 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 25 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 27 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
28 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 28 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 29 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
30 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 30 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 32 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 33 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34 * POSSIBILITY OF SUCH DAMAGE. 34 * POSSIBILITY OF SUCH DAMAGE.
35 */ 35 */
36 36
37 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 37 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
38 38
39 #include "core.h" 39 #include "core.h"
40 #include "name_table.h" 40 #include "name_table.h"
41 #include "subscr.h" 41 #include "subscr.h"
42 #include "bearer.h" 42 #include "bearer.h"
43 #include "net.h" 43 #include "net.h"
44 #include "socket.h" 44 #include "socket.h"
45 #include "bcast.h" 45 #include "bcast.h"
46 #include "node.h" 46 #include "node.h"
47 47
48 #include <linux/module.h> 48 #include <linux/module.h>
49 49
50 /* configurable TIPC parameters */ 50 /* configurable TIPC parameters */
51 unsigned int tipc_net_id __read_mostly; 51 unsigned int tipc_net_id __read_mostly;
52 int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */ 52 int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */
53 53
54 static int __net_init tipc_init_net(struct net *net) 54 static int __net_init tipc_init_net(struct net *net)
55 { 55 {
56 struct tipc_net *tn = net_generic(net, tipc_net_id); 56 struct tipc_net *tn = net_generic(net, tipc_net_id);
57 int err; 57 int err;
58 58
59 tn->net_id = 4711; 59 tn->net_id = 4711;
60 tn->node_addr = 0; 60 tn->node_addr = 0;
61 tn->trial_addr = 0; 61 tn->trial_addr = 0;
62 tn->addr_trial_end = 0; 62 tn->addr_trial_end = 0;
63 tn->capabilities = TIPC_NODE_CAPABILITIES; 63 tn->capabilities = TIPC_NODE_CAPABILITIES;
64 memset(tn->node_id, 0, sizeof(tn->node_id)); 64 memset(tn->node_id, 0, sizeof(tn->node_id));
65 memset(tn->node_id_string, 0, sizeof(tn->node_id_string)); 65 memset(tn->node_id_string, 0, sizeof(tn->node_id_string));
66 tn->mon_threshold = TIPC_DEF_MON_THRESHOLD; 66 tn->mon_threshold = TIPC_DEF_MON_THRESHOLD;
67 get_random_bytes(&tn->random, sizeof(int)); 67 get_random_bytes(&tn->random, sizeof(int));
68 INIT_LIST_HEAD(&tn->node_list); 68 INIT_LIST_HEAD(&tn->node_list);
69 spin_lock_init(&tn->node_list_lock); 69 spin_lock_init(&tn->node_list_lock);
70 70
71 err = tipc_socket_init();
72 if (err)
73 goto out_socket;
74
71 err = tipc_sk_rht_init(net); 75 err = tipc_sk_rht_init(net);
72 if (err) 76 if (err)
73 goto out_sk_rht; 77 goto out_sk_rht;
74 78
75 err = tipc_nametbl_init(net); 79 err = tipc_nametbl_init(net);
76 if (err) 80 if (err)
77 goto out_nametbl; 81 goto out_nametbl;
78 82
79 INIT_LIST_HEAD(&tn->dist_queue); 83 INIT_LIST_HEAD(&tn->dist_queue);
80 err = tipc_topsrv_start(net); 84 err = tipc_topsrv_start(net);
81 if (err) 85 if (err)
82 goto out_subscr; 86 goto out_subscr;
83 87
84 err = tipc_bcast_init(net); 88 err = tipc_bcast_init(net);
85 if (err) 89 if (err)
86 goto out_bclink; 90 goto out_bclink;
87 91
88 return 0; 92 return 0;
89 93
90 out_bclink: 94 out_bclink:
91 tipc_bcast_stop(net); 95 tipc_bcast_stop(net);
92 out_subscr: 96 out_subscr:
93 tipc_nametbl_stop(net); 97 tipc_nametbl_stop(net);
94 out_nametbl: 98 out_nametbl:
95 tipc_sk_rht_destroy(net); 99 tipc_sk_rht_destroy(net);
96 out_sk_rht: 100 out_sk_rht:
101 tipc_socket_stop();
102 out_socket:
97 return err; 103 return err;
98 } 104 }
99 105
100 static void __net_exit tipc_exit_net(struct net *net) 106 static void __net_exit tipc_exit_net(struct net *net)
101 { 107 {
102 tipc_topsrv_stop(net); 108 tipc_topsrv_stop(net);
103 tipc_net_stop(net); 109 tipc_net_stop(net);
104 tipc_bcast_stop(net); 110 tipc_bcast_stop(net);
105 tipc_nametbl_stop(net); 111 tipc_nametbl_stop(net);
106 tipc_sk_rht_destroy(net); 112 tipc_sk_rht_destroy(net);
113 tipc_socket_stop();
107 } 114 }
108 115
109 static struct pernet_operations tipc_net_ops = { 116 static struct pernet_operations tipc_net_ops = {
110 .init = tipc_init_net, 117 .init = tipc_init_net,
111 .exit = tipc_exit_net, 118 .exit = tipc_exit_net,
112 .id = &tipc_net_id, 119 .id = &tipc_net_id,
113 .size = sizeof(struct tipc_net), 120 .size = sizeof(struct tipc_net),
114 }; 121 };
115 122
116 static int __init tipc_init(void) 123 static int __init tipc_init(void)
117 { 124 {
118 int err; 125 int err;
119 126
120 pr_info("Activated (version " TIPC_MOD_VER ")\n"); 127 pr_info("Activated (version " TIPC_MOD_VER ")\n");
121 128
122 sysctl_tipc_rmem[0] = RCVBUF_MIN; 129 sysctl_tipc_rmem[0] = RCVBUF_MIN;
123 sysctl_tipc_rmem[1] = RCVBUF_DEF; 130 sysctl_tipc_rmem[1] = RCVBUF_DEF;
124 sysctl_tipc_rmem[2] = RCVBUF_MAX; 131 sysctl_tipc_rmem[2] = RCVBUF_MAX;
125 132
126 err = tipc_netlink_start(); 133 err = tipc_netlink_start();
127 if (err) 134 if (err)
128 goto out_netlink; 135 goto out_netlink;
129 136
130 err = tipc_netlink_compat_start(); 137 err = tipc_netlink_compat_start();
131 if (err) 138 if (err)
132 goto out_netlink_compat; 139 goto out_netlink_compat;
133 140
134 err = tipc_register_sysctl(); 141 err = tipc_register_sysctl();
135 if (err) 142 if (err)
136 goto out_sysctl; 143 goto out_sysctl;
137 144
138 err = register_pernet_subsys(&tipc_net_ops); 145 err = register_pernet_subsys(&tipc_net_ops);
139 if (err) 146 if (err)
140 goto out_pernet; 147 goto out_pernet;
141 148
142 err = tipc_socket_init();
143 if (err)
144 goto out_socket;
145
146 err = tipc_bearer_setup(); 149 err = tipc_bearer_setup();
147 if (err) 150 if (err)
148 goto out_bearer; 151 goto out_bearer;
149 152
150 pr_info("Started in single node mode\n"); 153 pr_info("Started in single node mode\n");
151 return 0; 154 return 0;
152 out_bearer: 155 out_bearer:
153 tipc_socket_stop();
154 out_socket:
155 unregister_pernet_subsys(&tipc_net_ops); 156 unregister_pernet_subsys(&tipc_net_ops);
156 out_pernet: 157 out_pernet:
157 tipc_unregister_sysctl(); 158 tipc_unregister_sysctl();
158 out_sysctl: 159 out_sysctl:
159 tipc_netlink_compat_stop(); 160 tipc_netlink_compat_stop();
160 out_netlink_compat: 161 out_netlink_compat:
161 tipc_netlink_stop(); 162 tipc_netlink_stop();
162 out_netlink: 163 out_netlink:
163 pr_err("Unable to start in single node mode\n"); 164 pr_err("Unable to start in single node mode\n");
164 return err; 165 return err;
165 } 166 }
166 167
167 static void __exit tipc_exit(void) 168 static void __exit tipc_exit(void)
168 { 169 {
169 tipc_bearer_cleanup(); 170 tipc_bearer_cleanup();
170 tipc_socket_stop();
171 unregister_pernet_subsys(&tipc_net_ops); 171 unregister_pernet_subsys(&tipc_net_ops);
172 tipc_netlink_stop(); 172 tipc_netlink_stop();
173 tipc_netlink_compat_stop(); 173 tipc_netlink_compat_stop();
174 tipc_unregister_sysctl(); 174 tipc_unregister_sysctl();
175 175
176 pr_info("Deactivated\n"); 176 pr_info("Deactivated\n");
177 } 177 }
178 178