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

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
...@@ -699,10 +699,10 @@ struct sctp_authhdr { ...@@ -699,10 +699,10 @@ struct sctp_authhdr {
__u8 hmac[0]; __u8 hmac[0];
}; };
typedef struct sctp_auth_chunk { struct sctp_auth_chunk {
struct sctp_chunkhdr chunk_hdr; struct sctp_chunkhdr chunk_hdr;
struct sctp_authhdr auth_hdr; struct sctp_authhdr auth_hdr;
} sctp_auth_chunk_t; };
struct sctp_infox { struct sctp_infox {
struct sctp_info *sctpinfo; struct sctp_info *sctpinfo;
......
...@@ -201,7 +201,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, ...@@ -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); struct sctp_hmac *hmac_desc = sctp_auth_asoc_get_hmac(asoc);
if (hmac_desc) 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); hmac_desc->hmac_len);
} }
......
...@@ -4093,7 +4093,7 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net, ...@@ -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 */ /* Pull in the auth header, so we can do some more verification */
auth_hdr = (struct sctp_authhdr *)chunk->skb->data; auth_hdr = (struct sctp_authhdr *)chunk->skb->data;
chunk->subh.auth_hdr = auth_hdr; 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 /* Make sure that we support the HMAC algorithm from the auth
* chunk. * chunk.
...@@ -4112,7 +4112,8 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net, ...@@ -4112,7 +4112,8 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net,
/* Make sure that the length of the signature matches what /* Make sure that the length of the signature matches what
* we expect. * 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)); hmac = sctp_auth_get_hmac(ntohs(auth_hdr->hmac_id));
if (sig_len != hmac->hmac_len) if (sig_len != hmac->hmac_len)
return SCTP_IERROR_PROTO_VIOLATION; return SCTP_IERROR_PROTO_VIOLATION;
...@@ -4134,8 +4135,8 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net, ...@@ -4134,8 +4135,8 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net,
memset(digest, 0, sig_len); memset(digest, 0, sig_len);
sctp_auth_calculate_hmac(asoc, chunk->skb, sctp_auth_calculate_hmac(asoc, chunk->skb,
(struct sctp_auth_chunk *)chunk->chunk_hdr, (struct sctp_auth_chunk *)chunk->chunk_hdr,
GFP_ATOMIC); GFP_ATOMIC);
/* Discard the packet if the digests do not match */ /* Discard the packet if the digests do not match */
if (memcmp(save_digest, digest, sig_len)) { if (memcmp(save_digest, digest, sig_len)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment