mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

[SCTP]: Update AUTH structures to match declarations in draft-16.

Browse source 
The new SCTP socket api (draft 16) updates the AUTH API structures.
We never exported these since we knew they would change.
Update the rest to match the draft.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
This commit is contained in:
Vlad Yasevich 2008-02-27 16:04:52 -05:00
parent b40db68468
commit 7e8616d8e7
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/net/sctp/user.h
View file

@ -411,6 +411,7 @@ struct sctp_event_subscribe {
__u8 sctp_shutdown_event; __u8 sctp_shutdown_event;
__u8 sctp_partial_delivery_event; __u8 sctp_partial_delivery_event;
__u8 sctp_adaptation_layer_event; __u8 sctp_adaptation_layer_event;
__u8 sctp_authentication_event;
}; };
/* /*
@ -587,7 +588,7 @@ struct sctp_authchunk {
* endpoint requires the peer to use. * endpoint requires the peer to use.
*/ */
struct sctp_hmacalgo { struct sctp_hmacalgo {
__u16 shmac_num_idents; __u32 shmac_num_idents;
__u16 shmac_idents[]; __u16 shmac_idents[];
}; };
@ -600,7 +601,7 @@ struct sctp_hmacalgo {
struct sctp_authkey { struct sctp_authkey {
sctp_assoc_t sca_assoc_id; sctp_assoc_t sca_assoc_id;
__u16 sca_keynumber; __u16 sca_keynumber;
__u16 sca_keylen; __u16 sca_keylength;
__u8 sca_key[]; __u8 sca_key[];
}; };
@ -693,8 +694,9 @@ struct sctp_status {
* the peer requires to be received authenticated only. * the peer requires to be received authenticated only.
*/ */
struct sctp_authchunks { struct sctp_authchunks {
sctp_assoc_t gauth_assoc_id; sctp_assoc_t gauth_assoc_id;
uint8_t gauth_chunks[]; __u32 gauth_number_of_chunks;
uint8_t gauth_chunks[];
}; };
/* /*

4
net/sctp/auth.c
View file

@ -838,11 +838,11 @@ int sctp_auth_set_key(struct sctp_endpoint *ep,
} }
/* Create a new key data based on the info passed in */ /* Create a new key data based on the info passed in */
key = sctp_auth_create_key(auth_key->sca_keylen, GFP_KERNEL); key = sctp_auth_create_key(auth_key->sca_keylength, GFP_KERNEL);
if (!key) if (!key)
goto nomem; goto nomem;
memcpy(key->data, &auth_key->sca_key[0], auth_key->sca_keylen); memcpy(key->data, &auth_key->sca_key[0], auth_key->sca_keylength);
/* If we are replacing, remove the old keys data from the /* If we are replacing, remove the old keys data from the
* key id. If we are adding new key id, add it to the * key id. If we are adding new key id, add it to the

6
net/sctp/socket.c
View file

@ -1964,7 +1964,7 @@ static int sctp_setsockopt_disable_fragments(struct sock *sk,
static int sctp_setsockopt_events(struct sock *sk, char __user *optval, static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
int optlen) int optlen)
{ {
if (optlen != sizeof(struct sctp_event_subscribe)) if (optlen > sizeof(struct sctp_event_subscribe))
return -EINVAL; return -EINVAL;
if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen)) if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
return -EFAULT; return -EFAULT;
@ -5094,6 +5094,8 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
len = num_chunks; len = num_chunks;
if (put_user(len, optlen)) if (put_user(len, optlen))
return -EFAULT; return -EFAULT;
if (put_user(num_chunks, &p->gauth_number_of_chunks))
return -EFAULT;
if (copy_to_user(to, ch->chunks, len)) if (copy_to_user(to, ch->chunks, len))
return -EFAULT; return -EFAULT;
@ -5133,6 +5135,8 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
len = num_chunks; len = num_chunks;
if (put_user(len, optlen)) if (put_user(len, optlen))
return -EFAULT; return -EFAULT;
if (put_user(num_chunks, &p->gauth_number_of_chunks))
return -EFAULT;
if (copy_to_user(to, ch->chunks, len)) if (copy_to_user(to, ch->chunks, len))
return -EFAULT; return -EFAULT;