mirror of https://gitee.com/openkylin/linux.git
[NETFILTER]: x_tables: move table->lock initialization
xt_table->lock should be initialized before xt_replace_table() call, which uses it. This patch removes strict requirement that table should define lock before registering. Signed-off-by: Dmitry Mishin <dim@openvz.org> Signed-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e4a79ef811
commit
91536b7ae6
|
@ -529,6 +529,7 @@ int xt_register_table(struct xt_table *table,
|
|||
|
||||
/* Simplifies replace_table code. */
|
||||
table->private = bootstrap;
|
||||
rwlock_init(&table->lock);
|
||||
if (!xt_replace_table(table, 0, newinfo, &ret))
|
||||
goto unlock;
|
||||
|
||||
|
@ -538,7 +539,6 @@ int xt_register_table(struct xt_table *table,
|
|||
/* save number of initial entries */
|
||||
private->initial_entries = private->number;
|
||||
|
||||
rwlock_init(&table->lock);
|
||||
list_prepend(&xt[table->af].tables, table);
|
||||
|
||||
ret = 0;
|
||||
|
|
Loading…
Reference in New Issue