Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e899b111 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: bridge: fix module autoload in compat case 



We expected 0 if module doesn't exist, which is no longer the case
(42046e2e,
netfilter: x_tables: return -ENOENT for non-existant matches/targets).

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent b072342e

net/bridge/netfilter/ebtables.c

+2 −8
Original line number Diff line number Diff line
@@ -1893,10 +1893,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, 


	switch (compat_mwt) {

	case EBT_COMPAT_MATCH:

		match = try_then_request_module(xt_find_match(NFPROTO_BRIDGE,

						name, 0), "ebt_%s", name);

		if (match == NULL)

			return -ENOENT;

		match = xt_request_find_match(NFPROTO_BRIDGE, name, 0);

		if (IS_ERR(match))

			return PTR_ERR(match);
@@ -1915,10 +1912,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, 
		break;

	case EBT_COMPAT_WATCHER: /* fallthrough */

	case EBT_COMPAT_TARGET:

		wt = try_then_request_module(xt_find_target(NFPROTO_BRIDGE,

						name, 0), "ebt_%s", name);

		if (wt == NULL)

			return -ENOENT;

		wt = xt_request_find_target(NFPROTO_BRIDGE, name, 0);

		if (IS_ERR(wt))

			return PTR_ERR(wt);

		off = xt_compat_target_offset(wt);