Commit be7263b7 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: xt_MARK: add compat conversion functions 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc80b656

net/netfilter/xt_MARK.c

+34 −0
Original line number Diff line number Diff line
@@ -108,6 +108,35 @@ checkentry_v1(const char *tablename, 
	return 1;

}



#ifdef CONFIG_COMPAT

struct compat_xt_mark_target_info_v1 {

	compat_ulong_t	mark;

	u_int8_t	mode;

	u_int8_t	__pad1;

	u_int16_t	__pad2;

};



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

{

	struct compat_xt_mark_target_info_v1 *cm = src;

	struct xt_mark_target_info_v1 m = {

		.mark	= cm->mark,

		.mode	= cm->mode,

	};

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

}



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

{

	struct xt_mark_target_info_v1 *m = src;

	struct compat_xt_mark_target_info_v1 cm = {

		.mark	= m->mark,

		.mode	= m->mode,

	};

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

}

#endif /* CONFIG_COMPAT */



static struct xt_target xt_mark_target[] = {

	{

		.name		= "MARK",
@@ -126,6 +155,11 @@ static struct xt_target xt_mark_target[] = { 
		.checkentry	= checkentry_v1,

		.target		= target_v1,

		.targetsize	= sizeof(struct xt_mark_target_info_v1),

#ifdef CONFIG_COMPAT

		.compatsize	= sizeof(struct compat_xt_mark_target_info_v1),

		.compat_from_user = compat_from_user_v1,

		.compat_to_user	= compat_to_user_v1,

#endif

		.table		= "mangle",

		.me		= THIS_MODULE,

	},