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

Commit 400b871b authored by Thomas Graf's avatar Thomas Graf Committed by Patrick McHardy
Browse files

netfilter ebtables: fix xt_AUDIT to work with ebtables 



Even though ebtables uses xtables it still requires targets to
return EBT_CONTINUE instead of XT_CONTINUE. This prevented
xt_AUDIT to work as ebt module.

Upon Jan's suggestion, use a separate struct xt_target for
NFPROTO_BRIDGE having its own target callback returning
EBT_CONTINUE instead of cloning the module.

Signed-off-by: default avatarThomas Graf <tgraf@redhat.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 2f5dc631

net/netfilter/xt_AUDIT.c

+27 −9
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/if_arp.h>

#include <linux/if_arp.h>

#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_AUDIT.h>

#include <linux/netfilter/xt_AUDIT.h>

#include <linux/netfilter_bridge/ebtables.h>

#include <net/ipv6.h>

#include <net/ipv6.h>

#include <net/ip.h>

#include <net/ip.h>
@@ -168,6 +169,13 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par) 
	return XT_CONTINUE;

	return XT_CONTINUE;

}

}





static unsigned int

audit_tg_ebt(struct sk_buff *skb, const struct xt_action_param *par)

{

	audit_tg(skb, par);

	return EBT_CONTINUE;

}



static int audit_tg_check(const struct xt_tgchk_param *par)

static int audit_tg_check(const struct xt_tgchk_param *par)

{

{

	const struct xt_audit_info *info = par->targinfo;

	const struct xt_audit_info *info = par->targinfo;
@@ -181,23 +189,33 @@ static int audit_tg_check(const struct xt_tgchk_param *par) 
	return 0;

	return 0;

}

}





static struct xt_target audit_tg_reg __read_mostly = {

static struct xt_target audit_tg_reg[] __read_mostly = {

	{

		.name		= "AUDIT",

		.name		= "AUDIT",

		.family		= NFPROTO_UNSPEC,

		.family		= NFPROTO_UNSPEC,

		.target		= audit_tg,

		.target		= audit_tg,

		.targetsize	= sizeof(struct xt_audit_info),

		.targetsize	= sizeof(struct xt_audit_info),

		.checkentry	= audit_tg_check,

		.checkentry	= audit_tg_check,

		.me		= THIS_MODULE,

		.me		= THIS_MODULE,

	},

	{

		.name		= "AUDIT",

		.family		= NFPROTO_BRIDGE,

		.target		= audit_tg_ebt,

		.targetsize	= sizeof(struct xt_audit_info),

		.checkentry	= audit_tg_check,

		.me		= THIS_MODULE,

	},

};

};





static int __init audit_tg_init(void)

static int __init audit_tg_init(void)

{

{

	return xt_register_target(&audit_tg_reg);

	return xt_register_targets(audit_tg_reg, ARRAY_SIZE(audit_tg_reg));

}

}





static void __exit audit_tg_exit(void)

static void __exit audit_tg_exit(void)

{

{

	xt_unregister_target(&audit_tg_reg);

	xt_unregister_targets(audit_tg_reg, ARRAY_SIZE(audit_tg_reg));

}

}





module_init(audit_tg_init);

module_init(audit_tg_init);