Commit ce18afe5 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

[NETFILTER]: x_tables: remove duplicate of xt_prefix 



Remove xt_proto_prefix array which duplicates xt_prefix and change all
users of xt_proto_prefix to xt_prefix.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 239254fe

net/netfilter/x_tables.c

+10 −16
Original line number Diff line number Diff line
@@ -651,12 +651,6 @@ void *xt_unregister_table(struct xt_table *table) 
EXPORT_SYMBOL_GPL(xt_unregister_table);



#ifdef CONFIG_PROC_FS

static char *xt_proto_prefix[NPROTO] = {

	[AF_INET]	= "ip",

	[AF_INET6]	= "ip6",

	[NF_ARP]	= "arp",

};



static struct list_head *xt_get_idx(struct list_head *list, struct seq_file *seq, loff_t pos)

{

	struct list_head *head = list->next;
@@ -798,7 +792,7 @@ int xt_proto_init(int af) 




#ifdef CONFIG_PROC_FS

	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	proc = proc_net_fops_create(buf, 0440, &xt_file_ops);

	if (!proc)
@@ -806,14 +800,14 @@ int xt_proto_init(int af) 
	proc->data = (void *) ((unsigned long) af | (TABLE << 16));





	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	proc = proc_net_fops_create(buf, 0440, &xt_file_ops);

	if (!proc)

		goto out_remove_tables;

	proc->data = (void *) ((unsigned long) af | (MATCH << 16));



	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TARGETS, sizeof(buf));

	proc = proc_net_fops_create(buf, 0440, &xt_file_ops);

	if (!proc)
@@ -825,12 +819,12 @@ int xt_proto_init(int af) 


#ifdef CONFIG_PROC_FS

out_remove_matches:

	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	proc_net_remove(buf);



out_remove_tables:

	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	proc_net_remove(buf);

out:
@@ -844,15 +838,15 @@ void xt_proto_fini(int af) 
#ifdef CONFIG_PROC_FS

	char buf[XT_FUNCTION_MAXNAMELEN];



	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	proc_net_remove(buf);



	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TARGETS, sizeof(buf));

	proc_net_remove(buf);



	strlcpy(buf, xt_proto_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	proc_net_remove(buf);

#endif /*CONFIG_PROC_FS*/