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

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

[NETFILTER]: {ip,ip6}_tables: fix format strings 



Use %zu for sizeof() and remove casts.

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

net/ipv4/netfilter/ip_tables.c

+8 −12
Original line number Diff line number Diff line
@@ -1091,8 +1091,8 @@ static int get_info(void __user *user, int *len, int compat) 
	int ret;



	if (*len != sizeof(struct ipt_getinfo)) {

		duprintf("length %u != %u\n", *len,

			(unsigned int)sizeof(struct ipt_getinfo));

		duprintf("length %u != %zu\n", *len,

			 sizeof(struct ipt_getinfo));

		return -EINVAL;

	}
@@ -1151,16 +1151,14 @@ get_entries(struct ipt_get_entries __user *uptr, int *len) 
	struct xt_table *t;



	if (*len < sizeof(get)) {

		duprintf("get_entries: %u < %d\n", *len,

				(unsigned int)sizeof(get));

		duprintf("get_entries: %u < %zu\n", *len, sizeof(get));

		return -EINVAL;

	}

	if (copy_from_user(&get, uptr, sizeof(get)) != 0)

		return -EFAULT;

	if (*len != sizeof(struct ipt_get_entries) + get.size) {

		duprintf("get_entries: %u != %u\n", *len,

				(unsigned int)(sizeof(struct ipt_get_entries) +

				get.size));

		duprintf("get_entries: %u != %zu\n",

			 *len, sizeof(get) + get.size);

		return -EINVAL;

	}
@@ -1911,8 +1909,7 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len) 
	struct xt_table *t;



	if (*len < sizeof(get)) {

		duprintf("compat_get_entries: %u < %u\n",

			 *len, (unsigned int)sizeof(get));

		duprintf("compat_get_entries: %u < %zu\n", *len, sizeof(get));

		return -EINVAL;

	}
@@ -1920,9 +1917,8 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len) 
		return -EFAULT;



	if (*len != sizeof(struct compat_ipt_get_entries) + get.size) {

		duprintf("compat_get_entries: %u != %u\n", *len,

			 (unsigned int)(sizeof(struct compat_ipt_get_entries) +

			 get.size));

		duprintf("compat_get_entries: %u != %zu\n",

			 *len, sizeof(get) + get.size);

		return -EINVAL;

	}

net/ipv6/netfilter/ip6_tables.c

+7 −9
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ static int get_info(void __user *user, int *len, int compat) 
	int ret;



	if (*len != sizeof(struct ip6t_getinfo)) {

		duprintf("length %u != %u\n", *len,

		duprintf("length %u != %zu\n", *len,

			 sizeof(struct ip6t_getinfo));

		return -EINVAL;

	}
@@ -1180,14 +1180,14 @@ get_entries(struct ip6t_get_entries __user *uptr, int *len) 
	struct xt_table *t;



	if (*len < sizeof(get)) {

		duprintf("get_entries: %u < %u\n", *len, sizeof(get));

		duprintf("get_entries: %u < %zu\n", *len, sizeof(get));

		return -EINVAL;

	}

	if (copy_from_user(&get, uptr, sizeof(get)) != 0)

		return -EFAULT;

	if (*len != sizeof(struct ip6t_get_entries) + get.size) {

		duprintf("get_entries: %u != %u\n", *len,

			 sizeof(struct ip6t_get_entries) + get.size);

		duprintf("get_entries: %u != %zu\n",

			 *len, sizeof(get) + get.size);

		return -EINVAL;

	}
@@ -1931,8 +1931,7 @@ compat_get_entries(struct compat_ip6t_get_entries __user *uptr, int *len) 
	struct xt_table *t;



	if (*len < sizeof(get)) {

		duprintf("compat_get_entries: %u < %u\n",

			 *len, (unsigned int)sizeof(get));

		duprintf("compat_get_entries: %u < %zu\n", *len, sizeof(get));

		return -EINVAL;

	}
@@ -1940,9 +1939,8 @@ compat_get_entries(struct compat_ip6t_get_entries __user *uptr, int *len) 
		return -EFAULT;



	if (*len != sizeof(struct compat_ip6t_get_entries) + get.size) {

		duprintf("compat_get_entries: %u != %u\n", *len,

			 (unsigned int)(sizeof(struct compat_ip6t_get_entries) +

			 get.size));

		duprintf("compat_get_entries: %u != %zu\n",

			 *len, sizeof(get) + get.size);

		return -EINVAL;

	}