From d75b0fd4ce8b204805485cc1f0446953b7752ec3 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Thu, 3 Jun 2004 08:34:23 -0700 Subject: [PATCH] [PATCH] sparse: more netfilter annotation --- include/linux/netfilter_arp/arp_tables.h | 2 +- include/linux/netfilter_ipv4/ip_tables.h | 2 +- include/linux/netfilter_ipv6/ip6_tables.h | 2 +- net/ipv4/netfilter/ipt_recent.c | 2 +- net/ipv6/netfilter/ip6_tables.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index d951537bab605..78c4f71422678 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -205,7 +205,7 @@ struct arpt_replace /* Number of counters (must be equal to current number of entries). */ unsigned int num_counters; /* The old entries' counters. */ - struct arpt_counters *counters; + struct arpt_counters __user *counters; /* The entries (hang off end: not really an array). */ struct arpt_entry entries[0]; diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index fb557e4877970..6f3aced444fe3 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -252,7 +252,7 @@ struct ipt_replace /* Number of counters (must be equal to current number of entries). */ unsigned int num_counters; /* The old entries' counters. */ - struct ipt_counters *counters; + struct ipt_counters __user *counters; /* The entries (hang off end: not really an array). */ struct ipt_entry entries[0]; diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index 3b6ac20135401..60bd65f536a51 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -258,7 +258,7 @@ struct ip6t_replace /* Number of counters (must be equal to current number of entries). */ unsigned int num_counters; /* The old entries' counters. */ - struct ip6t_counters *counters; + struct ip6t_counters __user *counters; /* The entries (hang off end: not really an array). */ struct ip6t_entry entries[0]; diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c index eda86a22accd3..08b786ac34dd0 100644 --- a/net/ipv4/netfilter/ipt_recent.c +++ b/net/ipv4/netfilter/ipt_recent.c @@ -175,7 +175,7 @@ static int ip_recent_get_info(char *buffer, char **start, off_t offset, int leng * clear -- Flush table, remove all entries */ -static int ip_recent_ctrl(struct file *file, const char *input, unsigned long size, void *data) +static int ip_recent_ctrl(struct file *file, const char __user *input, unsigned long size, void *data) { static const u_int32_t max[4] = { 0xffffffff, 0xffffff, 0xffff, 0xff }; u_int32_t val; diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index c84fd8eb416a0..6c747d91786c8 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -1028,7 +1028,7 @@ get_counters(const struct ip6t_table_info *t, static int copy_entries_to_user(unsigned int total_size, struct ip6t_table *table, - void *userptr) + void __user *userptr) { unsigned int off, num, countersize; struct ip6t_entry *e; -- 2.53.0