Commit cc07eeb0 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: nf_tables: nft_register_chain_type() returns void

Use WARN_ON() instead since it should not happen that neither family
goes over NFPROTO_NUMPROTO nor there is already a chain of this type
already registered.
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 32537e91
...@@ -970,7 +970,7 @@ struct nft_table { ...@@ -970,7 +970,7 @@ struct nft_table {
char *name; char *name;
}; };
int nft_register_chain_type(const struct nft_chain_type *); void nft_register_chain_type(const struct nft_chain_type *);
void nft_unregister_chain_type(const struct nft_chain_type *); void nft_unregister_chain_type(const struct nft_chain_type *);
int nft_register_expr(struct nft_expr_type *); int nft_register_expr(struct nft_expr_type *);
......
...@@ -63,7 +63,9 @@ static const struct nft_chain_type filter_bridge = { ...@@ -63,7 +63,9 @@ static const struct nft_chain_type filter_bridge = {
static int __init nf_tables_bridge_init(void) static int __init nf_tables_bridge_init(void)
{ {
return nft_register_chain_type(&filter_bridge); nft_register_chain_type(&filter_bridge);
return 0;
} }
static void __exit nf_tables_bridge_exit(void) static void __exit nf_tables_bridge_exit(void)
......
...@@ -42,7 +42,9 @@ static const struct nft_chain_type filter_arp = { ...@@ -42,7 +42,9 @@ static const struct nft_chain_type filter_arp = {
static int __init nf_tables_arp_init(void) static int __init nf_tables_arp_init(void)
{ {
return nft_register_chain_type(&filter_arp); nft_register_chain_type(&filter_arp);
return 0;
} }
static void __exit nf_tables_arp_exit(void) static void __exit nf_tables_arp_exit(void)
......
...@@ -51,7 +51,9 @@ static const struct nft_chain_type filter_ipv4 = { ...@@ -51,7 +51,9 @@ static const struct nft_chain_type filter_ipv4 = {
static int __init nf_tables_ipv4_init(void) static int __init nf_tables_ipv4_init(void)
{ {
return nft_register_chain_type(&filter_ipv4); nft_register_chain_type(&filter_ipv4);
return 0;
} }
static void __exit nf_tables_ipv4_exit(void) static void __exit nf_tables_ipv4_exit(void)
......
...@@ -86,11 +86,7 @@ static const struct nft_chain_type nft_chain_nat_ipv4 = { ...@@ -86,11 +86,7 @@ static const struct nft_chain_type nft_chain_nat_ipv4 = {
static int __init nft_chain_nat_init(void) static int __init nft_chain_nat_init(void)
{ {
int err; nft_register_chain_type(&nft_chain_nat_ipv4);
err = nft_register_chain_type(&nft_chain_nat_ipv4);
if (err < 0)
return err;
return 0; return 0;
} }
......
...@@ -71,7 +71,9 @@ static const struct nft_chain_type nft_chain_route_ipv4 = { ...@@ -71,7 +71,9 @@ static const struct nft_chain_type nft_chain_route_ipv4 = {
static int __init nft_chain_route_init(void) static int __init nft_chain_route_init(void)
{ {
return nft_register_chain_type(&nft_chain_route_ipv4); nft_register_chain_type(&nft_chain_route_ipv4);
return 0;
} }
static void __exit nft_chain_route_exit(void) static void __exit nft_chain_route_exit(void)
......
...@@ -49,7 +49,9 @@ static const struct nft_chain_type filter_ipv6 = { ...@@ -49,7 +49,9 @@ static const struct nft_chain_type filter_ipv6 = {
static int __init nf_tables_ipv6_init(void) static int __init nf_tables_ipv6_init(void)
{ {
return nft_register_chain_type(&filter_ipv6); nft_register_chain_type(&filter_ipv6);
return 0;
} }
static void __exit nf_tables_ipv6_exit(void) static void __exit nf_tables_ipv6_exit(void)
......
...@@ -84,11 +84,7 @@ static const struct nft_chain_type nft_chain_nat_ipv6 = { ...@@ -84,11 +84,7 @@ static const struct nft_chain_type nft_chain_nat_ipv6 = {
static int __init nft_chain_nat_ipv6_init(void) static int __init nft_chain_nat_ipv6_init(void)
{ {
int err; nft_register_chain_type(&nft_chain_nat_ipv6);
err = nft_register_chain_type(&nft_chain_nat_ipv6);
if (err < 0)
return err;
return 0; return 0;
} }
......
...@@ -73,7 +73,9 @@ static const struct nft_chain_type nft_chain_route_ipv6 = { ...@@ -73,7 +73,9 @@ static const struct nft_chain_type nft_chain_route_ipv6 = {
static int __init nft_chain_route_init(void) static int __init nft_chain_route_init(void)
{ {
return nft_register_chain_type(&nft_chain_route_ipv6); nft_register_chain_type(&nft_chain_route_ipv6);
return 0;
} }
static void __exit nft_chain_route_exit(void) static void __exit nft_chain_route_exit(void)
......
...@@ -859,22 +859,18 @@ static void nf_tables_table_destroy(struct nft_ctx *ctx) ...@@ -859,22 +859,18 @@ static void nf_tables_table_destroy(struct nft_ctx *ctx)
kfree(ctx->table); kfree(ctx->table);
} }
int nft_register_chain_type(const struct nft_chain_type *ctype) void nft_register_chain_type(const struct nft_chain_type *ctype)
{ {
int err = 0;
if (WARN_ON(ctype->family >= NFPROTO_NUMPROTO)) if (WARN_ON(ctype->family >= NFPROTO_NUMPROTO))
return -EINVAL; return;
nfnl_lock(NFNL_SUBSYS_NFTABLES); nfnl_lock(NFNL_SUBSYS_NFTABLES);
if (chain_type[ctype->family][ctype->type] != NULL) { if (WARN_ON(chain_type[ctype->family][ctype->type] != NULL)) {
err = -EBUSY; nfnl_unlock(NFNL_SUBSYS_NFTABLES);
goto out; return;
} }
chain_type[ctype->family][ctype->type] = ctype; chain_type[ctype->family][ctype->type] = ctype;
out:
nfnl_unlock(NFNL_SUBSYS_NFTABLES); nfnl_unlock(NFNL_SUBSYS_NFTABLES);
return err;
} }
EXPORT_SYMBOL_GPL(nft_register_chain_type); EXPORT_SYMBOL_GPL(nft_register_chain_type);
......
...@@ -59,7 +59,9 @@ static const struct nft_chain_type filter_inet = { ...@@ -59,7 +59,9 @@ static const struct nft_chain_type filter_inet = {
static int __init nf_tables_inet_init(void) static int __init nf_tables_inet_init(void)
{ {
return nft_register_chain_type(&filter_inet); nft_register_chain_type(&filter_inet);
return 0;
} }
static void __exit nf_tables_inet_exit(void) static void __exit nf_tables_inet_exit(void)
......
...@@ -112,9 +112,7 @@ static int __init nf_tables_netdev_init(void) ...@@ -112,9 +112,7 @@ static int __init nf_tables_netdev_init(void)
{ {
int ret; int ret;
ret = nft_register_chain_type(&nft_filter_chain_netdev); nft_register_chain_type(&nft_filter_chain_netdev);
if (ret)
return ret;
ret = register_netdevice_notifier(&nf_tables_netdev_notifier); ret = register_netdevice_notifier(&nf_tables_netdev_notifier);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment