[NETFILTER]: trivial annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>

[NETFILTER]: trivial annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Al Viro · David S. Miller
1 parent 0e11c91e1e
Showing 9 changed files with 36 additions and 37 deletions Side-by-side Diff
include/linux/netfilter/nfnetlink.h
include/linux/netfilter/nfnetlink_log.h
include/linux/netfilter/nfnetlink_queue.h
include/linux/netfilter/xt_conntrack.h
include/linux/netfilter/xt_policy.h
include/linux/types.h
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c
net/netfilter/xt_multiport.c
@@ -78,7 +78,7 @@
 struct nfgenmsg {
 	u_int8_t  nfgen_family;		/* AF_xxx */
 	u_int8_t  version;		/* nfnetlink version */
-	u_int16_t res_id;		/* resource id */
+	__be16    res_id;		/* resource id */
 };
  
 #define NFNETLINK_V0	0
@@ -16,20 +16,20 @@
 };
  
 struct nfulnl_msg_packet_hdr {
-	u_int16_t	hw_protocol;	/* hw protocol (network order) */
+	__be16		hw_protocol;	/* hw protocol (network order) */
 	u_int8_t	hook;		/* netfilter hook */
 	u_int8_t	_pad;
 };
  
 struct nfulnl_msg_packet_hw {
-	u_int16_t	hw_addrlen;
+	__be16		hw_addrlen;
 	u_int16_t	_pad;
 	u_int8_t	hw_addr[8];
 };
  
 struct nfulnl_msg_packet_timestamp {
-	aligned_u64	sec;
-	aligned_u64	usec;
+	aligned_be64	sec;
+	aligned_be64	usec;
 };
  
 #define NFULNL_PREFIXLEN	30	/* just like old log target */
@@ -67,7 +67,7 @@
 } __attribute__ ((packed));
  
 struct nfulnl_msg_config_mode {
-	u_int32_t	copy_range;
+	__be32		copy_range;
 	u_int8_t	copy_mode;
 	u_int8_t	_pad;
 } __attribute__ ((packed));
@@ -13,20 +13,20 @@
 };
  
 struct nfqnl_msg_packet_hdr {
-	u_int32_t	packet_id;	/* unique ID of packet in queue */
-	u_int16_t	hw_protocol;	/* hw protocol (network order) */
+	__be32		packet_id;	/* unique ID of packet in queue */
+	__be16		hw_protocol;	/* hw protocol (network order) */
 	u_int8_t	hook;		/* netfilter hook */
 } __attribute__ ((packed));
  
 struct nfqnl_msg_packet_hw {
-	u_int16_t	hw_addrlen;
+	__be16		hw_addrlen;
 	u_int16_t	_pad;
 	u_int8_t	hw_addr[8];
 };
  
 struct nfqnl_msg_packet_timestamp {
-	aligned_u64	sec;
-	aligned_u64	usec;
+	aligned_be64	sec;
+	aligned_be64	usec;
 };
  
 enum nfqnl_attr_type {
@@ -47,8 +47,8 @@
 #define NFQA_MAX (__NFQA_MAX - 1)
  
 struct nfqnl_msg_verdict_hdr {
-	u_int32_t verdict;
-	u_int32_t id;
+	__be32 verdict;
+	__be32 id;
 };
  
  
@@ -63,7 +63,7 @@
 struct nfqnl_msg_config_cmd {
 	u_int8_t	command;	/* nfqnl_msg_config_cmds */
 	u_int8_t	_pad;
-	u_int16_t	pf;		/* AF_xxx for PF_[UN]BIND */
+	__be16		pf;		/* AF_xxx for PF_[UN]BIND */
 };
  
 enum nfqnl_config_mode {
@@ -73,7 +73,7 @@
 };
  
 struct nfqnl_msg_config_params {
-	u_int32_t	copy_range;
+	__be32		copy_range;
 	u_int8_t	copy_mode;	/* enum nfqnl_config_mode */
 } __attribute__ ((packed));
  
@@ -29,14 +29,14 @@
 struct ip_conntrack_old_tuple
 {
 	struct {
-		__u32 ip;
+		__be32 ip;
 		union {
 			__u16 all;
 		} u;
 	} src;
  
 	struct {
-		__u32 ip;
+		__be32 ip;
 		union {
 			__u16 all;
 		} u;
@@ -39,7 +39,7 @@
 	union xt_policy_addr	smask;
 	union xt_policy_addr	daddr;
 	union xt_policy_addr	dmask;
-	u_int32_t		spi;
+	__be32			spi;
 	u_int32_t		reqid;
 	u_int8_t		proto;
 	u_int8_t		mode;
@@ -128,6 +128,8 @@
  
 /* this is a special 64bit data type that is 8-byte aligned */
 #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#define aligned_be64 __be64 __attribute__((aligned(8)))
+#define aligned_le64 __le64 __attribute__((aligned(8)))
  
 /**
  * The type used for indexing onto a disc or disc partition.
@@ -414,7 +414,7 @@
 	struct nfulnl_msg_packet_hdr pmsg;
 	struct nlmsghdr *nlh;
 	struct nfgenmsg *nfmsg;
-	u_int32_t tmp_uint;
+	__be32 tmp_uint;
  
 	UDEBUG("entered\n");
  
  
@@ -508,11 +508,9 @@
  
 	if (indev && skb->dev && skb->dev->hard_header_parse) {
 		struct nfulnl_msg_packet_hw phw;
-
-		phw.hw_addrlen = 
-			skb->dev->hard_header_parse((struct sk_buff *)skb, 
+		int len = skb->dev->hard_header_parse((struct sk_buff *)skb,
 						    phw.hw_addr);
-		phw.hw_addrlen = htons(phw.hw_addrlen);
+		phw.hw_addrlen = htons(len);
 		NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw);
 	}
  
@@ -529,7 +527,7 @@
 	if (skb->sk) {
 		read_lock_bh(&skb->sk->sk_callback_lock);
 		if (skb->sk->sk_socket && skb->sk->sk_socket->file) {
-			u_int32_t uid = htonl(skb->sk->sk_socket->file->f_uid);
+			__be32 uid = htonl(skb->sk->sk_socket->file->f_uid);
 			/* need to unlock here since NFA_PUT may goto */
 			read_unlock_bh(&skb->sk->sk_callback_lock);
 			NFA_PUT(inst->skb, NFULA_UID, sizeof(uid), &uid);
  
@@ -882,15 +880,15 @@
 	}
  
 	if (nfula[NFULA_CFG_TIMEOUT-1]) {
-		u_int32_t timeout = 
-			*(u_int32_t *)NFA_DATA(nfula[NFULA_CFG_TIMEOUT-1]);
+		__be32 timeout =
+			*(__be32 *)NFA_DATA(nfula[NFULA_CFG_TIMEOUT-1]);
  
 		nfulnl_set_timeout(inst, ntohl(timeout));
 	}
  
 	if (nfula[NFULA_CFG_NLBUFSIZ-1]) {
-		u_int32_t nlbufsiz = 
-			*(u_int32_t *)NFA_DATA(nfula[NFULA_CFG_NLBUFSIZ-1]);
+		__be32 nlbufsiz =
+			*(__be32 *)NFA_DATA(nfula[NFULA_CFG_NLBUFSIZ-1]);
  
 		nfulnl_set_nlbufsiz(inst, ntohl(nlbufsiz));
 	}
@@ -903,8 +901,8 @@
 	}
  
 	if (nfula[NFULA_CFG_FLAGS-1]) {
-		u_int16_t flags =
-			*(u_int16_t *)NFA_DATA(nfula[NFULA_CFG_FLAGS-1]);
+		__be16 flags =
+			*(__be16 *)NFA_DATA(nfula[NFULA_CFG_FLAGS-1]);
 		nfulnl_set_flags(inst, ntohs(flags));
 	}
  
@@ -349,7 +349,7 @@
 	struct sk_buff *entskb = entry->skb;
 	struct net_device *indev;
 	struct net_device *outdev;
-	unsigned int tmp_uint;
+	__be32 tmp_uint;
  
 	QDEBUG("entered\n");
  
  
@@ -489,10 +489,9 @@
 	    && entskb->dev->hard_header_parse) {
 		struct nfqnl_msg_packet_hw phw;
  
-		phw.hw_addrlen =
-			entskb->dev->hard_header_parse(entskb,
+		int len = entskb->dev->hard_header_parse(entskb,
 			                                   phw.hw_addr);
-		phw.hw_addrlen = htons(phw.hw_addrlen);
+		phw.hw_addrlen = htons(len);
 		NFA_PUT(skb, NFQA_HWADDR, sizeof(phw), &phw);
 	}
  
@@ -835,7 +834,7 @@
 	}
  
 	if (nfqa[NFQA_MARK-1])
-		entry->skb->nfmark = ntohl(*(u_int32_t *)
+		entry->skb->nfmark = ntohl(*(__be32 *)
 		                           NFA_DATA(nfqa[NFQA_MARK-1]));
  
 	issue_verdict(entry, verdict);
@@ -104,7 +104,7 @@
       unsigned int protoff,
       int *hotdrop)
 {
-	u16 _ports[2], *pptr;
+	__be16 _ports[2], *pptr;
 	const struct xt_multiport *multiinfo = matchinfo;
  
 	if (offset)
@@ -135,7 +135,7 @@
 	 unsigned int protoff,
 	 int *hotdrop)
 {
-	u16 _ports[2], *pptr;
+	__be16 _ports[2], *pptr;
 	const struct xt_multiport_v1 *multiinfo = matchinfo;
  
 	if (offset)
...	...	@@ -78,7 +78,7 @@
78	78	struct nfgenmsg {
79	79	u_int8_t nfgen_family; /* AF_xxx */
80	80	u_int8_t version; /* nfnetlink version */
81		- u_int16_t res_id; /* resource id */
	81	+ __be16 res_id; /* resource id */
82	82	};
83	83
84	84	#define NFNETLINK_V0 0
...	...	@@ -16,20 +16,20 @@
16	16	};
17	17
18	18	struct nfulnl_msg_packet_hdr {
19		- u_int16_t hw_protocol; /* hw protocol (network order) */
	19	+ __be16 hw_protocol; /* hw protocol (network order) */
20	20	u_int8_t hook; /* netfilter hook */
21	21	u_int8_t _pad;
22	22	};
23	23
24	24	struct nfulnl_msg_packet_hw {
25		- u_int16_t hw_addrlen;
	25	+ __be16 hw_addrlen;
26	26	u_int16_t _pad;
27	27	u_int8_t hw_addr[8];
28	28	};
29	29
30	30	struct nfulnl_msg_packet_timestamp {
31		- aligned_u64 sec;
32		- aligned_u64 usec;
	31	+ aligned_be64 sec;
	32	+ aligned_be64 usec;
33	33	};
34	34
35	35	#define NFULNL_PREFIXLEN 30 /* just like old log target */
...	...	@@ -67,7 +67,7 @@
67	67	} __attribute__ ((packed));
68	68
69	69	struct nfulnl_msg_config_mode {
70		- u_int32_t copy_range;
	70	+ __be32 copy_range;
71	71	u_int8_t copy_mode;
72	72	u_int8_t _pad;
73	73	} __attribute__ ((packed));
...	...	@@ -13,20 +13,20 @@
13	13	};
14	14
15	15	struct nfqnl_msg_packet_hdr {
16		- u_int32_t packet_id; /* unique ID of packet in queue */
17		- u_int16_t hw_protocol; /* hw protocol (network order) */
	16	+ __be32 packet_id; /* unique ID of packet in queue */
	17	+ __be16 hw_protocol; /* hw protocol (network order) */
18	18	u_int8_t hook; /* netfilter hook */
19	19	} __attribute__ ((packed));
20	20
21	21	struct nfqnl_msg_packet_hw {
22		- u_int16_t hw_addrlen;
	22	+ __be16 hw_addrlen;
23	23	u_int16_t _pad;
24	24	u_int8_t hw_addr[8];
25	25	};
26	26
27	27	struct nfqnl_msg_packet_timestamp {
28		- aligned_u64 sec;
29		- aligned_u64 usec;
	28	+ aligned_be64 sec;
	29	+ aligned_be64 usec;
30	30	};
31	31
32	32	enum nfqnl_attr_type {
...	...	@@ -47,8 +47,8 @@
47	47	#define NFQA_MAX (__NFQA_MAX - 1)
48	48
49	49	struct nfqnl_msg_verdict_hdr {
50		- u_int32_t verdict;
51		- u_int32_t id;
	50	+ __be32 verdict;
	51	+ __be32 id;
52	52	};
53	53
54	54
...	...	@@ -63,7 +63,7 @@
63	63	struct nfqnl_msg_config_cmd {
64	64	u_int8_t command; /* nfqnl_msg_config_cmds */
65	65	u_int8_t _pad;
66		- u_int16_t pf; /* AF_xxx for PF_[UN]BIND */
	66	+ __be16 pf; /* AF_xxx for PF_[UN]BIND */
67	67	};
68	68
69	69	enum nfqnl_config_mode {
...	...	@@ -73,7 +73,7 @@
73	73	};
74	74
75	75	struct nfqnl_msg_config_params {
76		- u_int32_t copy_range;
	76	+ __be32 copy_range;
77	77	u_int8_t copy_mode; /* enum nfqnl_config_mode */
78	78	} __attribute__ ((packed));
79	79
...	...	@@ -29,14 +29,14 @@
29	29	struct ip_conntrack_old_tuple
30	30	{
31	31	struct {
32		- __u32 ip;
	32	+ __be32 ip;
33	33	union {
34	34	__u16 all;
35	35	} u;
36	36	} src;
37	37
38	38	struct {
39		- __u32 ip;
	39	+ __be32 ip;
40	40	union {
41	41	__u16 all;
42	42	} u;
...	...	@@ -39,7 +39,7 @@
39	39	union xt_policy_addr smask;
40	40	union xt_policy_addr daddr;
41	41	union xt_policy_addr dmask;
42		- u_int32_t spi;
	42	+ __be32 spi;
43	43	u_int32_t reqid;
44	44	u_int8_t proto;
45	45	u_int8_t mode;
...	...	@@ -128,6 +128,8 @@
128	128
129	129	/* this is a special 64bit data type that is 8-byte aligned */
130	130	#define aligned_u64 unsigned long long __attribute__((aligned(8)))
	131	+#define aligned_be64 __be64 __attribute__((aligned(8)))
	132	+#define aligned_le64 __le64 __attribute__((aligned(8)))
131	133
132	134	/**
133	135	* The type used for indexing onto a disc or disc partition.
...	...	@@ -414,7 +414,7 @@
414	414	struct nfulnl_msg_packet_hdr pmsg;
415	415	struct nlmsghdr *nlh;
416	416	struct nfgenmsg *nfmsg;
417		- u_int32_t tmp_uint;
	417	+ __be32 tmp_uint;
418	418
419	419	UDEBUG("entered\n");
420	420
421	421
...	...	@@ -508,11 +508,9 @@
508	508
509	509	if (indev && skb->dev && skb->dev->hard_header_parse) {
510	510	struct nfulnl_msg_packet_hw phw;
511		-
512		- phw.hw_addrlen =
513		- skb->dev->hard_header_parse((struct sk_buff *)skb,
	511	+ int len = skb->dev->hard_header_parse((struct sk_buff *)skb,
514	512	phw.hw_addr);
515		- phw.hw_addrlen = htons(phw.hw_addrlen);
	513	+ phw.hw_addrlen = htons(len);
516	514	NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw);
517	515	}
518	516
...	...	@@ -529,7 +527,7 @@
529	527	if (skb->sk) {
530	528	read_lock_bh(&skb->sk->sk_callback_lock);
531	529	if (skb->sk->sk_socket && skb->sk->sk_socket->file) {
532		- u_int32_t uid = htonl(skb->sk->sk_socket->file->f_uid);
	530	+ __be32 uid = htonl(skb->sk->sk_socket->file->f_uid);
533	531	/* need to unlock here since NFA_PUT may goto */
534	532	read_unlock_bh(&skb->sk->sk_callback_lock);
535	533	NFA_PUT(inst->skb, NFULA_UID, sizeof(uid), &uid);
536	534
...	...	@@ -882,15 +880,15 @@
882	880	}
883	881
884	882	if (nfula[NFULA_CFG_TIMEOUT-1]) {
885		- u_int32_t timeout =
886		- (u_int32_t )NFA_DATA(nfula[NFULA_CFG_TIMEOUT-1]);
	883	+ __be32 timeout =
	884	+ (__be32 )NFA_DATA(nfula[NFULA_CFG_TIMEOUT-1]);
887	885
888	886	nfulnl_set_timeout(inst, ntohl(timeout));
889	887	}
890	888
891	889	if (nfula[NFULA_CFG_NLBUFSIZ-1]) {
892		- u_int32_t nlbufsiz =
893		- (u_int32_t )NFA_DATA(nfula[NFULA_CFG_NLBUFSIZ-1]);
	890	+ __be32 nlbufsiz =
	891	+ (__be32 )NFA_DATA(nfula[NFULA_CFG_NLBUFSIZ-1]);
894	892
895	893	nfulnl_set_nlbufsiz(inst, ntohl(nlbufsiz));
896	894	}
...	...	@@ -903,8 +901,8 @@
903	901	}
904	902
905	903	if (nfula[NFULA_CFG_FLAGS-1]) {
906		- u_int16_t flags =
907		- (u_int16_t )NFA_DATA(nfula[NFULA_CFG_FLAGS-1]);
	904	+ __be16 flags =
	905	+ (__be16 )NFA_DATA(nfula[NFULA_CFG_FLAGS-1]);
908	906	nfulnl_set_flags(inst, ntohs(flags));
909	907	}
910	908
...	...	@@ -349,7 +349,7 @@
349	349	struct sk_buff *entskb = entry->skb;
350	350	struct net_device *indev;
351	351	struct net_device *outdev;
352		- unsigned int tmp_uint;
	352	+ __be32 tmp_uint;
353	353
354	354	QDEBUG("entered\n");
355	355
356	356
...	...	@@ -489,10 +489,9 @@
489	489	&& entskb->dev->hard_header_parse) {
490	490	struct nfqnl_msg_packet_hw phw;
491	491
492		- phw.hw_addrlen =
493		- entskb->dev->hard_header_parse(entskb,
	492	+ int len = entskb->dev->hard_header_parse(entskb,
494	493	phw.hw_addr);
495		- phw.hw_addrlen = htons(phw.hw_addrlen);
	494	+ phw.hw_addrlen = htons(len);
496	495	NFA_PUT(skb, NFQA_HWADDR, sizeof(phw), &phw);
497	496	}
498	497
...	...	@@ -835,7 +834,7 @@
835	834	}
836	835
837	836	if (nfqa[NFQA_MARK-1])
838		- entry->skb->nfmark = ntohl((u_int32_t )
	837	+ entry->skb->nfmark = ntohl((__be32 )
839	838	NFA_DATA(nfqa[NFQA_MARK-1]));
840	839
841	840	issue_verdict(entry, verdict);
...	...	@@ -104,7 +104,7 @@
104	104	unsigned int protoff,
105	105	int *hotdrop)
106	106	{
107		- u16 _ports[2], *pptr;
	107	+ __be16 _ports[2], *pptr;
108	108	const struct xt_multiport *multiinfo = matchinfo;
109	109
110	110	if (offset)
...	...	@@ -135,7 +135,7 @@
135	135	unsigned int protoff,
136	136	int *hotdrop)
137	137	{
138		- u16 _ports[2], *pptr;
	138	+ __be16 _ports[2], *pptr;
139	139	const struct xt_multiport_v1 *multiinfo = matchinfo;
140	140
141	141	if (offset)