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

Commit bb96dec7 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: remove the typedef sctp_auth_chunk_t 



This patch is to remove the typedef sctp_auth_chunk_t, and
replace with struct sctp_auth_chunk in the places where it's
using this typedef.

It is also to use sizeof(variable) instead of sizeof(type).

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96f7ef4d

include/linux/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -699,10 +699,10 @@ struct sctp_authhdr { 
	__u8   hmac[0];

};



typedef struct sctp_auth_chunk {

struct sctp_auth_chunk {

	struct sctp_chunkhdr chunk_hdr;

	struct sctp_authhdr auth_hdr;

} sctp_auth_chunk_t;

};



struct sctp_infox {

	struct sctp_info *sctpinfo;

net/sctp/chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,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 -= SCTP_PAD4(sizeof(sctp_auth_chunk_t) +

			max_data -= SCTP_PAD4(sizeof(struct sctp_auth_chunk) +

					      hmac_desc->hmac_len);

	}

net/sctp/sm_statefuns.c

+5 −4
Original line number Diff line number Diff line
@@ -4093,7 +4093,7 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net, 
	/* Pull in the auth header, so we can do some more verification */

	auth_hdr = (struct sctp_authhdr *)chunk->skb->data;

	chunk->subh.auth_hdr = auth_hdr;

	skb_pull(chunk->skb, sizeof(struct sctp_authhdr));

	skb_pull(chunk->skb, sizeof(*auth_hdr));



	/* Make sure that we support the HMAC algorithm from the auth

	 * chunk.
@@ -4112,7 +4112,8 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net, 
	/* Make sure that the length of the signature matches what

	 * we expect.

	 */

	sig_len = ntohs(chunk->chunk_hdr->length) - sizeof(sctp_auth_chunk_t);

	sig_len = ntohs(chunk->chunk_hdr->length) -

		  sizeof(struct sctp_auth_chunk);

	hmac = sctp_auth_get_hmac(ntohs(auth_hdr->hmac_id));

	if (sig_len != hmac->hmac_len)

		return SCTP_IERROR_PROTO_VIOLATION;