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

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

[NETFILTER]: ip_tables: account for struct ipt_entry/struct compat_ipt_entry size diff 



Account for size differences when dumping entries or calculating the
entry positions. This doesn't actually make any difference for IPv4
since the structures have the same size, but its logically correct
and needed for IPv6.

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

net/ipv4/netfilter/ip_tables.c

+6 −2
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static int compat_calc_entry(struct ipt_entry *e, 
	unsigned int entry_offset;

	int off, i, ret;



	off = 0;

	off = sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);

	entry_offset = (void *)e - base;

	IPT_MATCH_ITERATE(e, compat_calc_match, &off);

	t = ipt_get_target(e);
@@ -1501,6 +1501,8 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr, 
		goto out;



	*dstptr += sizeof(struct compat_ipt_entry);

	*size -= sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);



	ret = IPT_MATCH_ITERATE(e, xt_compat_match_to_user, dstptr, size);

	target_offset = e->target_offset - (origsize - *size);

	if (ret)
@@ -1605,7 +1607,7 @@ check_compat_entry_size_and_hooks(struct ipt_entry *e, 
	if (ret)

		return ret;



	off = 0;

	off = sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);

	entry_offset = (void *)e - (void *)base;

	j = 0;

	ret = IPT_MATCH_ITERATE(e, compat_find_calc_match, name, &e->ip,
@@ -1671,6 +1673,8 @@ compat_copy_entry_from_user(struct ipt_entry *e, void **dstptr, 
	memcpy(de, e, sizeof(struct ipt_entry));



	*dstptr += sizeof(struct compat_ipt_entry);

	*size += sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);



	ret = IPT_MATCH_ITERATE(e, xt_compat_match_from_user, dstptr, size);

	if (ret)

		return ret;