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

Commit 2722971c authored by Dmitry Mishin's avatar Dmitry Mishin Committed by David S. Miller
Browse files

[NETFILTER]: iptables 32bit compat layer 



This patch extends current iptables compatibility layer in order to get
32bit iptables to work on 64bit kernel. Current layer is insufficient due
to alignment checks both in kernel and user space tools.

Patch is for current net-2.6.17 with addition of move of ipt_entry_{match|
target} definitions to xt_entry_{match|target}.

Signed-off-by: default avatarDmitry Mishin <dim@openvz.org>
Acked-off-by: default avatarKirill Korotaev <dev@openvz.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e64a70be

include/linux/netfilter/x_tables.h

+67 −0
Original line number Diff line number Diff line
@@ -142,6 +142,12 @@ struct xt_counters_info 
#define ASSERT_WRITE_LOCK(x)

#include <linux/netfilter_ipv4/listhelp.h>



#ifdef CONFIG_COMPAT

#define COMPAT_TO_USER		1

#define COMPAT_FROM_USER	-1

#define COMPAT_CALC_SIZE	0

#endif



struct xt_match

{

	struct list_head list;
@@ -175,6 +181,9 @@ struct xt_match 
	void (*destroy)(const struct xt_match *match, void *matchinfo,

			unsigned int matchinfosize);



	/* Called when userspace align differs from kernel space one */

	int (*compat)(void *match, void **dstptr, int *size, int convert);



	/* Set this to THIS_MODULE if you are a module, otherwise NULL */

	struct module *me;
@@ -220,6 +229,9 @@ struct xt_target 
	void (*destroy)(const struct xt_target *target, void *targinfo,

			unsigned int targinfosize);



	/* Called when userspace align differs from kernel space one */

	int (*compat)(void *target, void **dstptr, int *size, int convert);



	/* Set this to THIS_MODULE if you are a module, otherwise NULL */

	struct module *me;
@@ -314,6 +326,61 @@ extern void xt_proto_fini(int af); 
extern struct xt_table_info *xt_alloc_table_info(unsigned int size);

extern void xt_free_table_info(struct xt_table_info *info);



#ifdef CONFIG_COMPAT

#include <net/compat.h>



struct compat_xt_entry_match

{

	union {

		struct {

			u_int16_t match_size;

			char name[XT_FUNCTION_MAXNAMELEN - 1];

			u_int8_t revision;

		} user;

		u_int16_t match_size;

	} u;

	unsigned char data[0];

};



struct compat_xt_entry_target

{

	union {

		struct {

			u_int16_t target_size;

			char name[XT_FUNCTION_MAXNAMELEN - 1];

			u_int8_t revision;

		} user;

		u_int16_t target_size;

	} u;

	unsigned char data[0];

};



/* FIXME: this works only on 32 bit tasks

 * need to change whole approach in order to calculate align as function of

 * current task alignment */



struct compat_xt_counters

{

	u_int32_t cnt[4];

};



struct compat_xt_counters_info

{

	char name[XT_TABLE_MAXNAMELEN];

	compat_uint_t num_counters;

	struct compat_xt_counters counters[0];

};



#define COMPAT_XT_ALIGN(s) (((s) + (__alignof__(struct compat_xt_counters)-1)) \

		& ~(__alignof__(struct compat_xt_counters)-1))



extern void xt_compat_lock(int af);

extern void xt_compat_unlock(int af);

extern int xt_compat_match(void *match, void **dstptr, int *size, int convert);

extern int xt_compat_target(void *target, void **dstptr, int *size,

		int convert);



#endif /* CONFIG_COMPAT */

#endif /* __KERNEL__ */



#endif /* _X_TABLES_H */

include/linux/netfilter_ipv4/ip_tables.h

+18 −0
Original line number Diff line number Diff line
@@ -316,5 +316,23 @@ extern unsigned int ipt_do_table(struct sk_buff **pskb, 
				 void *userdata);



#define IPT_ALIGN(s) XT_ALIGN(s)



#ifdef CONFIG_COMPAT

#include <net/compat.h>



struct compat_ipt_entry

{

	struct ipt_ip ip;

	compat_uint_t nfcache;

	u_int16_t target_offset;

	u_int16_t next_offset;

	compat_uint_t comefrom;

	struct compat_xt_counters counters;

	unsigned char elems[0];

};



#define COMPAT_IPT_ALIGN(s) 	COMPAT_XT_ALIGN(s)



#endif /* CONFIG_COMPAT */

#endif /*__KERNEL__*/

#endif /* _IPTABLES_H */

net/compat.c

+1 −2
Original line number Diff line number Diff line
@@ -476,8 +476,7 @@ asmlinkage long compat_sys_setsockopt(int fd, int level, int optname, 
	int err;

	struct socket *sock;



	/* SO_SET_REPLACE seems to be the same in all levels */

	if (optname == IPT_SO_SET_REPLACE)

	if (level == SOL_IPV6 && optname == IPT_SO_SET_REPLACE)

		return do_netfilter_replace(fd, level, optname,

					    optval, optlen);

net/ipv4/netfilter/ip_tables.c

+1081 −205

File changed.

Preview size limit exceeded, changes collapsed.

net/netfilter/x_tables.c

+113 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct xt_af { 
	struct list_head match;

	struct list_head target;

	struct list_head tables;

	struct mutex compat_mutex;

};



static struct xt_af *xt;
@@ -272,6 +273,54 @@ int xt_check_match(const struct xt_match *match, unsigned short family, 
}

EXPORT_SYMBOL_GPL(xt_check_match);



#ifdef CONFIG_COMPAT

int xt_compat_match(void *match, void **dstptr, int *size, int convert)

{

	struct xt_match *m;

	struct compat_xt_entry_match *pcompat_m;

	struct xt_entry_match *pm;

	u_int16_t msize;

	int off, ret;



	ret = 0;

	m = ((struct xt_entry_match *)match)->u.kernel.match;

	off = XT_ALIGN(m->matchsize) - COMPAT_XT_ALIGN(m->matchsize);

	switch (convert) {

		case COMPAT_TO_USER:

			pm = (struct xt_entry_match *)match;

			msize = pm->u.user.match_size;

			if (__copy_to_user(*dstptr, pm, msize)) {

				ret = -EFAULT;

				break;

			}

			msize -= off;

			if (put_user(msize, (u_int16_t *)*dstptr))

				ret = -EFAULT;

			*size -= off;

			*dstptr += msize;

			break;

		case COMPAT_FROM_USER:

			pcompat_m = (struct compat_xt_entry_match *)match;

			pm = (struct xt_entry_match *)*dstptr;

			msize = pcompat_m->u.user.match_size;

			memcpy(pm, pcompat_m, msize);

			msize += off;

			pm->u.user.match_size = msize;

			*size += off;

			*dstptr += msize;

			break;

		case COMPAT_CALC_SIZE:

			*size += off;

			break;

		default:

			ret = -ENOPROTOOPT;

			break;

	}

	return ret;

}

EXPORT_SYMBOL_GPL(xt_compat_match);

#endif



int xt_check_target(const struct xt_target *target, unsigned short family,

		    unsigned int size, const char *table, unsigned int hook_mask,

		    unsigned short proto, int inv_proto)
@@ -301,6 +350,54 @@ int xt_check_target(const struct xt_target *target, unsigned short family, 
}

EXPORT_SYMBOL_GPL(xt_check_target);



#ifdef CONFIG_COMPAT

int xt_compat_target(void *target, void **dstptr, int *size, int convert)

{

	struct xt_target *t;

	struct compat_xt_entry_target *pcompat;

	struct xt_entry_target *pt;

	u_int16_t tsize;

	int off, ret;



	ret = 0;

	t = ((struct xt_entry_target *)target)->u.kernel.target;

	off = XT_ALIGN(t->targetsize) - COMPAT_XT_ALIGN(t->targetsize);

	switch (convert) {

		case COMPAT_TO_USER:

			pt = (struct xt_entry_target *)target;

			tsize = pt->u.user.target_size;

			if (__copy_to_user(*dstptr, pt, tsize)) {

				ret = -EFAULT;

				break;

			}

			tsize -= off;

			if (put_user(tsize, (u_int16_t *)*dstptr))

				ret = -EFAULT;

			*size -= off;

			*dstptr += tsize;

			break;

		case COMPAT_FROM_USER:

			pcompat = (struct compat_xt_entry_target *)target;

			pt = (struct xt_entry_target *)*dstptr;

			tsize = pcompat->u.user.target_size;

			memcpy(pt, pcompat, tsize);

			tsize += off;

			pt->u.user.target_size = tsize;

			*size += off;

			*dstptr += tsize;

			break;

		case COMPAT_CALC_SIZE:

			*size += off;

			break;

		default:

			ret = -ENOPROTOOPT;

			break;

	}

	return ret;

}

EXPORT_SYMBOL_GPL(xt_compat_target);

#endif



struct xt_table_info *xt_alloc_table_info(unsigned int size)

{

	struct xt_table_info *newinfo;
@@ -371,6 +468,19 @@ void xt_table_unlock(struct xt_table *table) 
}

EXPORT_SYMBOL_GPL(xt_table_unlock);



#ifdef CONFIG_COMPAT

void xt_compat_lock(int af)

{

	mutex_lock(&xt[af].compat_mutex);

}

EXPORT_SYMBOL_GPL(xt_compat_lock);



void xt_compat_unlock(int af)

{

	mutex_unlock(&xt[af].compat_mutex);

}

EXPORT_SYMBOL_GPL(xt_compat_unlock);

#endif



struct xt_table_info *

xt_replace_table(struct xt_table *table,
@@ -671,6 +781,9 @@ static int __init xt_init(void) 


	for (i = 0; i < NPROTO; i++) {

		mutex_init(&xt[i].mutex);

#ifdef CONFIG_COMPAT

		mutex_init(&xt[i].compat_mutex);

#endif

		INIT_LIST_HEAD(&xt[i].target);

		INIT_LIST_HEAD(&xt[i].match);

		INIT_LIST_HEAD(&xt[i].tables);