diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-06-26 02:23:19 -0400 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-02-15 10:59:28 -0500 |
commit | 739674fb7febf116e7d647031fab16989a08a965 (patch) | |
tree | b2b0bcde6aa93dfc7a9811da7805affcef225a2a /net/ipv4 | |
parent | b402405d71beed8e4df354844353f66b4e18269f (diff) |
netfilter: xtables: constify args in compat copying functions
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/arp_tables.c | 4 | ||||
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 4 | ||||
-rw-r--r-- | net/ipv4/netfilter/ipt_ULOG.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c index 72723ea1054b..2303dc92a277 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c | |||
@@ -842,7 +842,7 @@ static int copy_entries_to_user(unsigned int total_size, | |||
842 | } | 842 | } |
843 | 843 | ||
844 | #ifdef CONFIG_COMPAT | 844 | #ifdef CONFIG_COMPAT |
845 | static void compat_standard_from_user(void *dst, void *src) | 845 | static void compat_standard_from_user(void *dst, const void *src) |
846 | { | 846 | { |
847 | int v = *(compat_int_t *)src; | 847 | int v = *(compat_int_t *)src; |
848 | 848 | ||
@@ -851,7 +851,7 @@ static void compat_standard_from_user(void *dst, void *src) | |||
851 | memcpy(dst, &v, sizeof(v)); | 851 | memcpy(dst, &v, sizeof(v)); |
852 | } | 852 | } |
853 | 853 | ||
854 | static int compat_standard_to_user(void __user *dst, void *src) | 854 | static int compat_standard_to_user(void __user *dst, const void *src) |
855 | { | 855 | { |
856 | compat_int_t cv = *(int *)src; | 856 | compat_int_t cv = *(int *)src; |
857 | 857 | ||
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 2057b1bb6178..2a4f745ce36e 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -1047,7 +1047,7 @@ copy_entries_to_user(unsigned int total_size, | |||
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | #ifdef CONFIG_COMPAT | 1049 | #ifdef CONFIG_COMPAT |
1050 | static void compat_standard_from_user(void *dst, void *src) | 1050 | static void compat_standard_from_user(void *dst, const void *src) |
1051 | { | 1051 | { |
1052 | int v = *(compat_int_t *)src; | 1052 | int v = *(compat_int_t *)src; |
1053 | 1053 | ||
@@ -1056,7 +1056,7 @@ static void compat_standard_from_user(void *dst, void *src) | |||
1056 | memcpy(dst, &v, sizeof(v)); | 1056 | memcpy(dst, &v, sizeof(v)); |
1057 | } | 1057 | } |
1058 | 1058 | ||
1059 | static int compat_standard_to_user(void __user *dst, void *src) | 1059 | static int compat_standard_to_user(void __user *dst, const void *src) |
1060 | { | 1060 | { |
1061 | compat_int_t cv = *(int *)src; | 1061 | compat_int_t cv = *(int *)src; |
1062 | 1062 | ||
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c index 399061c3fd7d..09a5d3f7cc41 100644 --- a/net/ipv4/netfilter/ipt_ULOG.c +++ b/net/ipv4/netfilter/ipt_ULOG.c | |||
@@ -338,7 +338,7 @@ struct compat_ipt_ulog_info { | |||
338 | char prefix[ULOG_PREFIX_LEN]; | 338 | char prefix[ULOG_PREFIX_LEN]; |
339 | }; | 339 | }; |
340 | 340 | ||
341 | static void ulog_tg_compat_from_user(void *dst, void *src) | 341 | static void ulog_tg_compat_from_user(void *dst, const void *src) |
342 | { | 342 | { |
343 | const struct compat_ipt_ulog_info *cl = src; | 343 | const struct compat_ipt_ulog_info *cl = src; |
344 | struct ipt_ulog_info l = { | 344 | struct ipt_ulog_info l = { |
@@ -351,7 +351,7 @@ static void ulog_tg_compat_from_user(void *dst, void *src) | |||
351 | memcpy(dst, &l, sizeof(l)); | 351 | memcpy(dst, &l, sizeof(l)); |
352 | } | 352 | } |
353 | 353 | ||
354 | static int ulog_tg_compat_to_user(void __user *dst, void *src) | 354 | static int ulog_tg_compat_to_user(void __user *dst, const void *src) |
355 | { | 355 | { |
356 | const struct ipt_ulog_info *l = src; | 356 | const struct ipt_ulog_info *l = src; |
357 | struct compat_ipt_ulog_info cl = { | 357 | struct compat_ipt_ulog_info cl = { |