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

Commit 5452e425 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

[NETFILTER]: annotate {arp,ip,ip6,x}tables with const 



Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 3cf93c96

include/linux/netfilter/x_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -430,13 +430,13 @@ extern int xt_compat_add_offset(int af, unsigned int offset, short delta); 
extern void xt_compat_flush_offsets(int af);

extern short xt_compat_calc_jump(int af, unsigned int offset);



extern int xt_compat_match_offset(struct xt_match *match);

extern int xt_compat_match_offset(const struct xt_match *match);

extern int xt_compat_match_from_user(struct xt_entry_match *m,

				     void **dstptr, unsigned int *size);

extern int xt_compat_match_to_user(struct xt_entry_match *m,

				   void __user **dstptr, unsigned int *size);



extern int xt_compat_target_offset(struct xt_target *target);

extern int xt_compat_target_offset(const struct xt_target *target);

extern void xt_compat_target_from_user(struct xt_entry_target *t,

				       void **dstptr, unsigned int *size);

extern int xt_compat_target_to_user(struct xt_entry_target *t,

net/ipv4/netfilter/arp_tables.c

+16 −15
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ do { \ 
#endif



static inline int arp_devaddr_compare(const struct arpt_devaddr_info *ap,

				      char *hdr_addr, int len)

				      const char *hdr_addr, int len)

{

	int i, ret;
@@ -80,8 +80,8 @@ static inline int arp_packet_match(const struct arphdr *arphdr, 
				   const char *outdev,

				   const struct arpt_arp *arpinfo)

{

	char *arpptr = (char *)(arphdr + 1);

	char *src_devaddr, *tgt_devaddr;

	const char *arpptr = (char *)(arphdr + 1);

	const char *src_devaddr, *tgt_devaddr;

	__be32 src_ipaddr, tgt_ipaddr;

	int i, ret;
@@ -226,12 +226,12 @@ unsigned int arpt_do_table(struct sk_buff *skb, 
{

	static const char nulldevname[IFNAMSIZ];

	unsigned int verdict = NF_DROP;

	struct arphdr *arp;

	const struct arphdr *arp;

	bool hotdrop = false;

	struct arpt_entry *e, *back;

	const char *indev, *outdev;

	void *table_base;

	struct xt_table_info *private;

	const struct xt_table_info *private;



	if (!pskb_may_pull(skb, arp_hdr_len(skb->dev)))

		return NF_DROP;
@@ -352,7 +352,7 @@ static int mark_source_chains(struct xt_table_info *newinfo, 
		e->counters.pcnt = pos;



		for (;;) {

			struct arpt_standard_target *t

			const struct arpt_standard_target *t

				= (void *)arpt_get_target(e);

			int visited = e->comefrom & (1 << hook);
@@ -437,7 +437,7 @@ static int mark_source_chains(struct xt_table_info *newinfo, 


static inline int check_entry(struct arpt_entry *e, const char *name)

{

	struct arpt_entry_target *t;

	const struct arpt_entry_target *t;



	if (!arp_checkentry(&e->arp)) {

		duprintf("arp_tables: arp check failed %p %s.\n", e, name);
@@ -710,7 +710,7 @@ static inline struct xt_counters *alloc_counters(struct arpt_table *table) 
{

	unsigned int countersize;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;



	/* We need atomic snapshot of counters: rest doesn't change

	 * (other than comefrom, which userspace doesn't care
@@ -737,7 +737,7 @@ static int copy_entries_to_user(unsigned int total_size, 
	unsigned int off, num;

	struct arpt_entry *e;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;

	int ret = 0;

	void *loc_cpu_entry;
@@ -872,7 +872,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat) 
				    "arptable_%s", name);

	if (t && !IS_ERR(t)) {

		struct arpt_getinfo info;

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;



#ifdef CONFIG_COMPAT

		if (compat) {
@@ -927,7 +927,8 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr, 


	t = xt_find_table_lock(net, NF_ARP, get.name);

	if (t && !IS_ERR(t)) {

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;



		duprintf("t->private->number = %u\n",

			 private->number);

		if (get.size == private->size)
@@ -1087,11 +1088,11 @@ static int do_add_counters(struct net *net, void __user *user, unsigned int len, 
	struct xt_counters_info tmp;

	struct xt_counters *paddc;

	unsigned int num_counters;

	char *name;

	const char *name;

	int size;

	void *ptmp;

	struct arpt_table *t;

	struct xt_table_info *private;

	const struct xt_table_info *private;

	int ret = 0;

	void *loc_cpu_entry;

#ifdef CONFIG_COMPAT
@@ -1558,7 +1559,7 @@ static int compat_copy_entries_to_user(unsigned int total_size, 
				       void __user *userptr)

{

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;

	void __user *pos;

	unsigned int size;

	int ret = 0;
@@ -1609,7 +1610,7 @@ static int compat_get_entries(struct net *net, 
	xt_compat_lock(NF_ARP);

	t = xt_find_table_lock(net, NF_ARP, get.name);

	if (t && !IS_ERR(t)) {

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;

		struct xt_table_info info;



		duprintf("t->private->number = %u\n", private->number);

net/ipv4/netfilter/arpt_mangle.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ target(struct sk_buff *skb, 
       const void *targinfo)

{

	const struct arpt_mangle *mangle = targinfo;

	struct arphdr *arp;

	const struct arphdr *arp;

	unsigned char *arpptr;

	int pln, hln;

net/ipv4/netfilter/ip_tables.c

+16 −15
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static void trace_packet(struct sk_buff *skb, 
			 struct ipt_entry *e)

{

	void *table_base;

	struct ipt_entry *root;

	const struct ipt_entry *root;

	char *hookname, *chainname, *comment;

	unsigned int rulenum = 0;
@@ -327,7 +327,7 @@ ipt_do_table(struct sk_buff *skb, 
{

	static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));

	u_int16_t offset;

	struct iphdr *ip;

	const struct iphdr *ip;

	u_int16_t datalen;

	bool hotdrop = false;

	/* Initializing verdict to NF_DROP keeps gcc happy. */
@@ -926,7 +926,7 @@ static struct xt_counters * alloc_counters(struct xt_table *table) 
{

	unsigned int countersize;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;



	/* We need atomic snapshot of counters: rest doesn't change

	   (other than comefrom, which userspace doesn't care
@@ -953,9 +953,9 @@ copy_entries_to_user(unsigned int total_size, 
	unsigned int off, num;

	struct ipt_entry *e;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;

	int ret = 0;

	void *loc_cpu_entry;

	const void *loc_cpu_entry;



	counters = alloc_counters(table);

	if (IS_ERR(counters))
@@ -975,8 +975,8 @@ copy_entries_to_user(unsigned int total_size, 
	/* ... then go back and fix counters and names */

	for (off = 0, num = 0; off < total_size; off += e->next_offset, num++){

		unsigned int i;

		struct ipt_entry_match *m;

		struct ipt_entry_target *t;

		const struct ipt_entry_match *m;

		const struct ipt_entry_target *t;



		e = (struct ipt_entry *)(loc_cpu_entry + off);

		if (copy_to_user(userptr + off
@@ -1116,7 +1116,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat) 
				    "iptable_%s", name);

	if (t && !IS_ERR(t)) {

		struct ipt_getinfo info;

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;



#ifdef CONFIG_COMPAT

		if (compat) {
@@ -1172,7 +1172,7 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr, int *len) 


	t = xt_find_table_lock(net, AF_INET, get.name);

	if (t && !IS_ERR(t)) {

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;

		duprintf("t->private->number = %u\n", private->number);

		if (get.size == private->size)

			ret = copy_entries_to_user(private->size,
@@ -1337,11 +1337,11 @@ do_add_counters(struct net *net, void __user *user, unsigned int len, int compat 
	struct xt_counters_info tmp;

	struct xt_counters *paddc;

	unsigned int num_counters;

	char *name;

	const char *name;

	int size;

	void *ptmp;

	struct xt_table *t;

	struct xt_table_info *private;

	const struct xt_table_info *private;

	int ret = 0;

	void *loc_cpu_entry;

#ifdef CONFIG_COMPAT
@@ -1878,11 +1878,11 @@ compat_copy_entries_to_user(unsigned int total_size, struct xt_table *table, 
			    void __user *userptr)

{

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;

	void __user *pos;

	unsigned int size;

	int ret = 0;

	void *loc_cpu_entry;

	const void *loc_cpu_entry;

	unsigned int i = 0;



	counters = alloc_counters(table);
@@ -1929,7 +1929,7 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr, 
	xt_compat_lock(AF_INET);

	t = xt_find_table_lock(net, AF_INET, get.name);

	if (t && !IS_ERR(t)) {

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;

		struct xt_table_info info;

		duprintf("t->private->number = %u\n", private->number);

		ret = compat_table_info(private, &info);
@@ -2130,7 +2130,8 @@ icmp_match(const struct sk_buff *skb, 
	   unsigned int protoff,

	   bool *hotdrop)

{

	struct icmphdr _icmph, *ic;

	const struct icmphdr *ic;

	struct icmphdr _icmph;

	const struct ipt_icmp *icmpinfo = matchinfo;



	/* Must not be a fragment. */

net/ipv6/netfilter/ip6_tables.c

+15 −14
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void trace_packet(struct sk_buff *skb, 
			 struct ip6t_entry *e)

{

	void *table_base;

	struct ip6t_entry *root;

	const struct ip6t_entry *root;

	char *hookname, *chainname, *comment;

	unsigned int rulenum = 0;
@@ -952,7 +952,7 @@ static struct xt_counters *alloc_counters(struct xt_table *table) 
{

	unsigned int countersize;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;



	/* We need atomic snapshot of counters: rest doesn't change

	   (other than comefrom, which userspace doesn't care
@@ -979,9 +979,9 @@ copy_entries_to_user(unsigned int total_size, 
	unsigned int off, num;

	struct ip6t_entry *e;

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;

	int ret = 0;

	void *loc_cpu_entry;

	const void *loc_cpu_entry;



	counters = alloc_counters(table);

	if (IS_ERR(counters))
@@ -1001,8 +1001,8 @@ copy_entries_to_user(unsigned int total_size, 
	/* ... then go back and fix counters and names */

	for (off = 0, num = 0; off < total_size; off += e->next_offset, num++){

		unsigned int i;

		struct ip6t_entry_match *m;

		struct ip6t_entry_target *t;

		const struct ip6t_entry_match *m;

		const struct ip6t_entry_target *t;



		e = (struct ip6t_entry *)(loc_cpu_entry + off);

		if (copy_to_user(userptr + off
@@ -1142,7 +1142,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat) 
				    "ip6table_%s", name);

	if (t && !IS_ERR(t)) {

		struct ip6t_getinfo info;

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;



#ifdef CONFIG_COMPAT

		if (compat) {
@@ -1225,7 +1225,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, 
	struct xt_table *t;

	struct xt_table_info *oldinfo;

	struct xt_counters *counters;

	void *loc_cpu_old_entry;

	const void *loc_cpu_old_entry;



	ret = 0;

	counters = vmalloc_node(num_counters * sizeof(struct xt_counters),
@@ -1369,9 +1369,9 @@ do_add_counters(struct net *net, void __user *user, unsigned int len, 
	int size;

	void *ptmp;

	struct xt_table *t;

	struct xt_table_info *private;

	const struct xt_table_info *private;

	int ret = 0;

	void *loc_cpu_entry;

	const void *loc_cpu_entry;

#ifdef CONFIG_COMPAT

	struct compat_xt_counters_info compat_tmp;
@@ -1905,11 +1905,11 @@ compat_copy_entries_to_user(unsigned int total_size, struct xt_table *table, 
			    void __user *userptr)

{

	struct xt_counters *counters;

	struct xt_table_info *private = table->private;

	const struct xt_table_info *private = table->private;

	void __user *pos;

	unsigned int size;

	int ret = 0;

	void *loc_cpu_entry;

	const void *loc_cpu_entry;

	unsigned int i = 0;



	counters = alloc_counters(table);
@@ -1956,7 +1956,7 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr, 
	xt_compat_lock(AF_INET6);

	t = xt_find_table_lock(net, AF_INET6, get.name);

	if (t && !IS_ERR(t)) {

		struct xt_table_info *private = t->private;

		const struct xt_table_info *private = t->private;

		struct xt_table_info info;

		duprintf("t->private->number = %u\n", private->number);

		ret = compat_table_info(private, &info);
@@ -2155,7 +2155,8 @@ icmp6_match(const struct sk_buff *skb, 
	   unsigned int protoff,

	   bool *hotdrop)

{

	struct icmp6hdr _icmph, *ic;

	const struct icmp6hdr *ic;

	struct icmp6hdr _icmph;

	const struct ip6t_icmp *icmpinfo = matchinfo;



	/* Must not be a fragment. */