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

Commit e2f036a9 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: rename WORD_TRUNC/ROUND macros 



To something more meaningful these days, specially because this is
working on packet headers or lengths and which are not tied to any CPU
arch but to the protocol itself.

So, WORD_TRUNC becomes SCTP_TRUNC4 and WORD_ROUND becomes SCTP_PAD4.

Reported-by: default avatarDavid Laight <David.Laight@ACULAB.COM>
Reported-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b80b8d7a

include/net/sctp/sctp.h

+5 −5
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ 
#endif



/* Round an int up to the next multiple of 4.  */

#define WORD_ROUND(s) (((s)+3)&~3)

#define SCTP_PAD4(s) (((s)+3)&~3)

/* Truncate to the previous multiple of 4.  */

#define WORD_TRUNC(s) ((s)&~3)

#define SCTP_TRUNC4(s) ((s)&~3)



/*

 * Function declarations.
@@ -433,7 +433,7 @@ static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu) 
	if (asoc->user_frag)

		frag = min_t(int, frag, asoc->user_frag);



	frag = WORD_TRUNC(min_t(int, frag, SCTP_MAX_CHUNK_LEN));

	frag = SCTP_TRUNC4(min_t(int, frag, SCTP_MAX_CHUNK_LEN));



	return frag;

}
@@ -462,7 +462,7 @@ _sctp_walk_params((pos), (chunk), ntohs((chunk)->chunk_hdr.length), member) 
for (pos.v = chunk->member;\

     pos.v <= (void *)chunk + end - ntohs(pos.p->length) &&\

     ntohs(pos.p->length) >= sizeof(sctp_paramhdr_t);\

     pos.v += WORD_ROUND(ntohs(pos.p->length)))

     pos.v += SCTP_PAD4(ntohs(pos.p->length)))



#define sctp_walk_errors(err, chunk_hdr)\

_sctp_walk_errors((err), (chunk_hdr), ntohs((chunk_hdr)->length))
@@ -472,7 +472,7 @@ for (err = (sctp_errhdr_t *)((void *)chunk_hdr + \ 
	    sizeof(sctp_chunkhdr_t));\

     (void *)err <= (void *)chunk_hdr + end - ntohs(err->length) &&\

     ntohs(err->length) >= sizeof(sctp_errhdr_t); \

     err = (sctp_errhdr_t *)((void *)err + WORD_ROUND(ntohs(err->length))))

     err = (sctp_errhdr_t *)((void *)err + SCTP_PAD4(ntohs(err->length))))



#define sctp_walk_fwdtsn(pos, chunk)\

_sctp_walk_fwdtsn((pos), (chunk), ntohs((chunk)->chunk_hdr->length) - sizeof(struct sctp_fwdtsn_chunk))

net/netfilter/xt_sctp.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ match_packet(const struct sk_buff *skb, 
			 ++i, offset, sch->type, htons(sch->length),

			 sch->flags);

#endif

		offset += WORD_ROUND(ntohs(sch->length));

		offset += SCTP_PAD4(ntohs(sch->length));



		pr_debug("skb->len: %d\toffset: %d\n", skb->len, offset);

net/sctp/associola.c

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ void sctp_assoc_sync_pmtu(struct sock *sk, struct sctp_association *asoc) 
				transports) {

		if (t->pmtu_pending && t->dst) {

			sctp_transport_update_pmtu(sk, t,

						   WORD_TRUNC(dst_mtu(t->dst)));

						   SCTP_TRUNC4(dst_mtu(t->dst)));

			t->pmtu_pending = 0;

		}

		if (!pmtu || (t->pathmtu < pmtu))

net/sctp/chunk.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, 
		struct sctp_hmac *hmac_desc = sctp_auth_asoc_get_hmac(asoc);



		if (hmac_desc)

			max_data -= WORD_ROUND(sizeof(sctp_auth_chunk_t) +

			max_data -= SCTP_PAD4(sizeof(sctp_auth_chunk_t) +

					      hmac_desc->hmac_len);

	}
@@ -229,7 +229,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, 
	    asoc->outqueue.out_qlen == 0 &&

	    list_empty(&asoc->outqueue.retransmit) &&

	    msg_len > max)

		max_data -= WORD_ROUND(sizeof(sctp_sack_chunk_t));

		max_data -= SCTP_PAD4(sizeof(sctp_sack_chunk_t));



	/* Encourage Cookie-ECHO bundling. */

	if (asoc->state < SCTP_STATE_COOKIE_ECHOED)

net/sctp/input.c

+4 −4
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info) 
		/* PMTU discovery (RFC1191) */

		if (ICMP_FRAG_NEEDED == code) {

			sctp_icmp_frag_needed(sk, asoc, transport,

					      WORD_TRUNC(info));

					      SCTP_TRUNC4(info));

			goto out_unlock;

		} else {

			if (ICMP_PROT_UNREACH == code) {
@@ -673,7 +673,7 @@ static int sctp_rcv_ootb(struct sk_buff *skb) 
		if (ntohs(ch->length) < sizeof(sctp_chunkhdr_t))

			break;



		ch_end = offset + WORD_ROUND(ntohs(ch->length));

		ch_end = offset + SCTP_PAD4(ntohs(ch->length));

		if (ch_end > skb->len)

			break;
@@ -1121,7 +1121,7 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net, 
		if (ntohs(ch->length) < sizeof(sctp_chunkhdr_t))

			break;



		ch_end = ((__u8 *)ch) + WORD_ROUND(ntohs(ch->length));

		ch_end = ((__u8 *)ch) + SCTP_PAD4(ntohs(ch->length));

		if (ch_end > skb_tail_pointer(skb))

			break;
@@ -1190,7 +1190,7 @@ static struct sctp_association *__sctp_rcv_lookup_harder(struct net *net, 
	 * that the chunk length doesn't cause overflow.  Otherwise, we'll

	 * walk off the end.

	 */

	if (WORD_ROUND(ntohs(ch->length)) > skb->len)

	if (SCTP_PAD4(ntohs(ch->length)) > skb->len)

		return NULL;



	/* If this is INIT/INIT-ACK look inside the chunk too. */