Commit d7c03a9f authored by wenxu's avatar wenxu Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: check if bind callback fails and unbind if hook registration fails



Undo the callback binding before unregistering the existing hooks. This
should also check for error of the bind setup call.

Fixes: c29f74e0 ("netfilter: nf_flow_table: hardware offload support")
Signed-off-by: default avatarwenxu <wenxu@ucloud.cn>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 63b48c73
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -6006,12 +6006,20 @@ static int nft_register_flowtable_net_hooks(struct net *net,
			}
		}

		flowtable->data.type->setup(&flowtable->data, hook->ops.dev,
		err = flowtable->data.type->setup(&flowtable->data,
						  hook->ops.dev,
						  FLOW_BLOCK_BIND);
		err = nf_register_net_hook(net, &hook->ops);
		if (err < 0)
			goto err_unregister_net_hooks;

		err = nf_register_net_hook(net, &hook->ops);
		if (err < 0) {
			flowtable->data.type->setup(&flowtable->data,
						    hook->ops.dev,
						    FLOW_BLOCK_UNBIND);
			goto err_unregister_net_hooks;
		}

		i++;
	}