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

Commit 60fe62e7 authored by Andrea Bittau's avatar Andrea Bittau Committed by David S. Miller
Browse files

[DCCP]: sparse endianness annotations 



This also fixes the layout of dccp_hdr short sequence numbers, problem
was not fatal now as we only support long (48 bits) sequence numbers.

Signed-off-by: default avatarAndrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a193a4ab

include/linux/dccp.h

+21 −31
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * @dccph_seq - sequence number high or low order 24 bits, depends on dccph_x

 */

struct dccp_hdr {

	__u16	dccph_sport,

	__be16	dccph_sport,

		dccph_dport;

	__u8	dccph_doff;

#if defined(__LITTLE_ENDIAN_BITFIELD)
@@ -32,18 +32,18 @@ struct dccp_hdr { 
#endif

	__u16	dccph_checksum;

#if defined(__LITTLE_ENDIAN_BITFIELD)

	__u32	dccph_x:1,

	__u8	dccph_x:1,

		dccph_type:4,

		dccph_reserved:3,

		dccph_seq:24;

		dccph_reserved:3;

#elif defined(__BIG_ENDIAN_BITFIELD)

	__u32	dccph_reserved:3,

	__u8	dccph_reserved:3,

		dccph_type:4,

		dccph_x:1,

		dccph_seq:24;

		dccph_x:1;

#else

#error  "Adjust your <asm/byteorder.h> defines"

#endif

	__u8	dccph_seq2;

	__be16	dccph_seq;

};



/**
@@ -52,7 +52,7 @@ struct dccp_hdr { 
 * @dccph_seq_low - low 24 bits of a 48 bit seq packet

 */

struct dccp_hdr_ext {

	__u32	dccph_seq_low;

	__be32	dccph_seq_low;

};



/**
@@ -62,7 +62,7 @@ struct dccp_hdr_ext { 
 * @dccph_req_options - list of options (must be a multiple of 32 bits

 */

struct dccp_hdr_request {

	__u32	dccph_req_service;

	__be32	dccph_req_service;

};

/**

 * struct dccp_hdr_ack_bits - acknowledgment bits common to most packets
@@ -71,9 +71,9 @@ struct dccp_hdr_request { 
 * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR

 */

struct dccp_hdr_ack_bits {

	__u32	dccph_reserved1:8,

		dccph_ack_nr_high:24;

	__u32	dccph_ack_nr_low;

	__be16	dccph_reserved1;

	__be16	dccph_ack_nr_high;

	__be32	dccph_ack_nr_low;

};

/**

 * struct dccp_hdr_response - Conection initiation response header
@@ -85,7 +85,7 @@ struct dccp_hdr_ack_bits { 
 */

struct dccp_hdr_response {

	struct dccp_hdr_ack_bits	dccph_resp_ack;

	__u32				dccph_resp_service;

	__be32				dccph_resp_service;

};



/**
@@ -269,16 +269,12 @@ static inline unsigned int dccp_basic_hdr_len(const struct sk_buff *skb) 
static inline __u64 dccp_hdr_seq(const struct sk_buff *skb)

{

	const struct dccp_hdr *dh = dccp_hdr(skb);

#if defined(__LITTLE_ENDIAN_BITFIELD)

	__u64 seq_nr = ntohl(dh->dccph_seq << 8);

#elif defined(__BIG_ENDIAN_BITFIELD)

	__u64 seq_nr = ntohl(dh->dccph_seq);

#else

#error  "Adjust your <asm/byteorder.h> defines"

#endif

	__u64 seq_nr =  ntohs(dh->dccph_seq);



	if (dh->dccph_x != 0)

		seq_nr = (seq_nr << 32) + ntohl(dccp_hdrx(skb)->dccph_seq_low);

	else

		seq_nr += (u32)dh->dccph_seq2 << 16;



	return seq_nr;

}
@@ -296,13 +292,7 @@ static inline struct dccp_hdr_ack_bits *dccp_hdr_ack_bits(const struct sk_buff * 
static inline u64 dccp_hdr_ack_seq(const struct sk_buff *skb)

{

	const struct dccp_hdr_ack_bits *dhack = dccp_hdr_ack_bits(skb);

#if defined(__LITTLE_ENDIAN_BITFIELD)

	return (((u64)ntohl(dhack->dccph_ack_nr_high << 8)) << 32) + ntohl(dhack->dccph_ack_nr_low);

#elif defined(__BIG_ENDIAN_BITFIELD)

	return (((u64)ntohl(dhack->dccph_ack_nr_high)) << 32) + ntohl(dhack->dccph_ack_nr_low);

#else

#error  "Adjust your <asm/byteorder.h> defines"

#endif

	return ((u64)ntohs(dhack->dccph_ack_nr_high) << 32) + ntohl(dhack->dccph_ack_nr_low);

}



static inline struct dccp_hdr_response *dccp_hdr_response(struct sk_buff *skb)
@@ -387,7 +377,7 @@ struct dccp_request_sock { 
	struct inet_request_sock dreq_inet_rsk;

	__u64			 dreq_iss;

	__u64			 dreq_isr;

	__u32			 dreq_service;

	__be32			 dreq_service;

};



static inline struct dccp_request_sock *dccp_rsk(const struct request_sock *req)
@@ -415,13 +405,13 @@ enum dccp_role { 


struct dccp_service_list {

	__u32	dccpsl_nr;

	__u32	dccpsl_list[0];

	__be32	dccpsl_list[0];

};



#define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)



static inline int dccp_list_has_service(const struct dccp_service_list *sl,

					const u32 service)

					const __be32 service)

{

	if (likely(sl != NULL)) {

		u32 i = sl->dccpsl_nr;
@@ -467,7 +457,7 @@ struct dccp_sock { 
	__u64				dccps_gss;

	__u64				dccps_gsr;

	__u64				dccps_gar;

	__u32				dccps_service;

	__be32				dccps_service;

	struct dccp_service_list	*dccps_service_list;

	struct timeval			dccps_timestamp_time;

	__u32				dccps_timestamp_echo;

net/dccp/ccids/ccid3.c

+3 −3
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option, 
				       __FUNCTION__, dccp_role(sk), sk);

			rc = -EINVAL;

		} else {

			opt_recv->ccid3or_loss_event_rate = ntohl(*(u32 *)value);

			opt_recv->ccid3or_loss_event_rate = ntohl(*(__be32 *)value);

			ccid3_pr_debug("%s, sk=%p, LOSS_EVENT_RATE=%u\n",

				       dccp_role(sk), sk,

				       opt_recv->ccid3or_loss_event_rate);
@@ -636,7 +636,7 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option, 
				       __FUNCTION__, dccp_role(sk), sk);

			rc = -EINVAL;

		} else {

			opt_recv->ccid3or_receive_rate = ntohl(*(u32 *)value);

			opt_recv->ccid3or_receive_rate = ntohl(*(__be32 *)value);

			ccid3_pr_debug("%s, sk=%p, RECEIVE_RATE=%u\n",

				       dccp_role(sk), sk,

				       opt_recv->ccid3or_receive_rate);
@@ -777,7 +777,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk) 
static void ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)

{

	const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);

	u32 x_recv, pinv;

	__be32 x_recv, pinv;



	BUG_ON(hcrx == NULL);

net/dccp/dccp.h

+6 −17
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ extern int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, 
				   int addr_len);



extern int	   dccp_v4_checksum(const struct sk_buff *skb,

				    const u32 saddr, const u32 daddr);

				    const __be32 saddr, const __be32 daddr);



extern int	   dccp_v4_send_reset(struct sock *sk,

				      enum dccp_reset_codes code);
@@ -270,7 +270,7 @@ extern void dccp_send_close(struct sock *sk, const int active); 
extern int	   dccp_invalid_packet(struct sk_buff *skb);



static inline int dccp_bad_service_code(const struct sock *sk,

					const __u32 service)

					const __be32 service)

{

	const struct dccp_sock *dp = dccp_sk(sk);
@@ -334,27 +334,16 @@ static inline void dccp_hdr_set_seq(struct dccp_hdr *dh, const u64 gss) 
{

	struct dccp_hdr_ext *dhx = (struct dccp_hdr_ext *)((void *)dh +

							   sizeof(*dh));



#if defined(__LITTLE_ENDIAN_BITFIELD)

	dh->dccph_seq	   = htonl((gss >> 32)) >> 8;

#elif defined(__BIG_ENDIAN_BITFIELD)

	dh->dccph_seq	   = htonl((gss >> 32));

#else

#error  "Adjust your <asm/byteorder.h> defines"

#endif

	dh->dccph_seq2 = 0;

	dh->dccph_seq = htons((gss >> 32) & 0xfffff);

	dhx->dccph_seq_low = htonl(gss & 0xffffffff);

}



static inline void dccp_hdr_set_ack(struct dccp_hdr_ack_bits *dhack,

				    const u64 gsr)

{

#if defined(__LITTLE_ENDIAN_BITFIELD)

	dhack->dccph_ack_nr_high = htonl((gsr >> 32)) >> 8;

#elif defined(__BIG_ENDIAN_BITFIELD)

	dhack->dccph_ack_nr_high = htonl((gsr >> 32));

#else

#error  "Adjust your <asm/byteorder.h> defines"

#endif

	dhack->dccph_reserved1 = 0;

	dhack->dccph_ack_nr_high = htons(gsr >> 32);

	dhack->dccph_ack_nr_low  = htonl(gsr & 0xffffffff);

}

net/dccp/ipv4.c

+6 −6
Original line number Diff line number Diff line
@@ -498,9 +498,9 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	struct dccp_sock dp;

	struct request_sock *req;

	struct dccp_request_sock *dreq;

	const __u32 saddr = skb->nh.iph->saddr;

	const __u32 daddr = skb->nh.iph->daddr;

 	const __u32 service = dccp_hdr_request(skb)->dccph_req_service;

	const __be32 saddr = skb->nh.iph->saddr;

	const __be32 daddr = skb->nh.iph->daddr;

 	const __be32 service = dccp_hdr_request(skb)->dccph_req_service;

	struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);

	__u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
@@ -662,8 +662,8 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) 
	return sk;

}



int dccp_v4_checksum(const struct sk_buff *skb, const u32 saddr,

		     const u32 daddr)

int dccp_v4_checksum(const struct sk_buff *skb, const __be32 saddr,

		     const __be32 daddr)

{

	const struct dccp_hdr* dh = dccp_hdr(skb);

	int checksum_len;
@@ -683,7 +683,7 @@ int dccp_v4_checksum(const struct sk_buff *skb, const u32 saddr, 
}



static int dccp_v4_verify_checksum(struct sk_buff *skb,

				   const u32 saddr, const u32 daddr)

				   const __be32 saddr, const __be32 daddr)

{

	struct dccp_hdr *dh = dccp_hdr(skb);

	int checksum_len;

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
}



static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,

			int type, int code, int offset, __u32 info)

			int type, int code, int offset, __be32 info)

{

	struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data;

	const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
@@ -678,7 +678,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
	struct dccp_request_sock *dreq;

	struct inet6_request_sock *ireq6;

	struct ipv6_pinfo *np = inet6_sk(sk);

 	const __u32 service = dccp_hdr_request(skb)->dccph_req_service;

 	const __be32 service = dccp_hdr_request(skb)->dccph_req_service;

	struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);

	__u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;