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

Use %zu for sizeof() and remove casts.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 231f5d290755b8202273b4b323438b5a07e9fe42..98c65ac47d4ccc32e84f096e53607183b2503de6 100644 (file)
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -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;
        }
 

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 0a2ec4b346fb2d64b38cfc549fecadd62438b9a5..40893fc059263ef9e74057762f31c248a1726821 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -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;
        }