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

Commit 4725c728 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: remove xt_mark v0 



Superseded by xt_mark v1 (v2.6.24-2922-g17b0d7e).

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 36d4084d

Documentation/feature-removal-schedule.txt

+0 −3
Original line number Diff line number Diff line
@@ -238,9 +238,6 @@ What (Why): 
	- "forwarding" header files like ipt_mac.h in

	  include/linux/netfilter_ipv4/ and include/linux/netfilter_ipv6/



	- xt_mark match revision 0

	  (superseded by xt_mark match revision 1)



	- xt_recent: the old ipt_recent proc dir

	  (superseded by /proc/net/xt_recent)

include/linux/netfilter/xt_mark.h

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 


#include <linux/types.h>



struct xt_mark_info {

    unsigned long mark, mask;

    __u8 invert;

};



struct xt_mark_mtinfo1 {

	__u32 mark, mask;

	__u8 invert;

net/netfilter/xt_mark.c

+10 −76
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 *	(C) 1999-2001 Marc Boucher <marc@mbsi.ca>

 *	Copyright © CC Computer Consultants GmbH, 2007 - 2008

 *	Jan Engelhardt <jengelh@computergmbh.de>

 *	Jan Engelhardt <jengelh@medozas.de>

 *

 *	This program is free software; you can redistribute it and/or modify

 *	it under the terms of the GNU General Public License version 2 as
@@ -22,14 +22,6 @@ MODULE_DESCRIPTION("Xtables: packet mark match"); 
MODULE_ALIAS("ipt_mark");

MODULE_ALIAS("ip6t_mark");



static bool

mark_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)

{

	const struct xt_mark_info *info = par->matchinfo;



	return ((skb->mark & info->mask) == info->mark) ^ info->invert;

}



static bool

mark_mt(const struct sk_buff *skb, const struct xt_match_param *par)

{
@@ -38,81 +30,23 @@ mark_mt(const struct sk_buff *skb, const struct xt_match_param *par) 
	return ((skb->mark & info->mask) == info->mark) ^ info->invert;

}



static bool mark_mt_check_v0(const struct xt_mtchk_param *par)

{

	const struct xt_mark_info *minfo = par->matchinfo;



	if (minfo->mark > 0xffffffff || minfo->mask > 0xffffffff) {

		printk(KERN_WARNING "mark: only supports 32bit mark\n");

		return false;

	}

	return true;

}



#ifdef CONFIG_COMPAT

struct compat_xt_mark_info {

	compat_ulong_t	mark, mask;

	u_int8_t	invert;

	u_int8_t	__pad1;

	u_int16_t	__pad2;

};



static void mark_mt_compat_from_user_v0(void *dst, void *src)

{

	const struct compat_xt_mark_info *cm = src;

	struct xt_mark_info m = {

		.mark	= cm->mark,

		.mask	= cm->mask,

		.invert	= cm->invert,

	};

	memcpy(dst, &m, sizeof(m));

}



static int mark_mt_compat_to_user_v0(void __user *dst, void *src)

{

	const struct xt_mark_info *m = src;

	struct compat_xt_mark_info cm = {

		.mark	= m->mark,

		.mask	= m->mask,

		.invert	= m->invert,

	};

	return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;

}

#endif /* CONFIG_COMPAT */



static struct xt_match mark_mt_reg[] __read_mostly = {

	{

		.name		= "mark",

		.revision	= 0,

		.family		= NFPROTO_UNSPEC,

		.checkentry	= mark_mt_check_v0,

		.match		= mark_mt_v0,

		.matchsize	= sizeof(struct xt_mark_info),

#ifdef CONFIG_COMPAT

		.compatsize	= sizeof(struct compat_xt_mark_info),

		.compat_from_user = mark_mt_compat_from_user_v0,

		.compat_to_user	= mark_mt_compat_to_user_v0,

#endif

		.me		= THIS_MODULE,

	},

	{

static struct xt_match mark_mt_reg __read_mostly = {

	.name           = "mark",

	.revision       = 1,

	.family         = NFPROTO_UNSPEC,

	.match          = mark_mt,

	.matchsize      = sizeof(struct xt_mark_mtinfo1),

	.me             = THIS_MODULE,

	},

};



static int __init mark_mt_init(void)

{

	return xt_register_matches(mark_mt_reg, ARRAY_SIZE(mark_mt_reg));

	return xt_register_match(&mark_mt_reg);

}



static void __exit mark_mt_exit(void)

{

	xt_unregister_matches(mark_mt_reg, ARRAY_SIZE(mark_mt_reg));

	xt_unregister_match(&mark_mt_reg);

}



module_init(mark_mt_init);