[SCTP]: Update AUTH structures to match declarations in draft-16.
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:
@@ -838,11 +838,11 @@ int sctp_auth_set_key(struct sctp_endpoint *ep,
|
||||
}
|
||||
|
||||
/* 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)
|
||||
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
|
||||
* key id. If we are adding new key id, add it to the
|
||||
|
@@ -1964,7 +1964,7 @@ static int sctp_setsockopt_disable_fragments(struct sock *sk,
|
||||
static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
|
||||
int optlen)
|
||||
{
|
||||
if (optlen != sizeof(struct sctp_event_subscribe))
|
||||
if (optlen > sizeof(struct sctp_event_subscribe))
|
||||
return -EINVAL;
|
||||
if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
|
||||
return -EFAULT;
|
||||
@@ -5094,6 +5094,8 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
|
||||
len = num_chunks;
|
||||
if (put_user(len, optlen))
|
||||
return -EFAULT;
|
||||
if (put_user(num_chunks, &p->gauth_number_of_chunks))
|
||||
return -EFAULT;
|
||||
if (copy_to_user(to, ch->chunks, len))
|
||||
return -EFAULT;
|
||||
|
||||
@@ -5133,6 +5135,8 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
|
||||
len = num_chunks;
|
||||
if (put_user(len, optlen))
|
||||
return -EFAULT;
|
||||
if (put_user(num_chunks, &p->gauth_number_of_chunks))
|
||||
return -EFAULT;
|
||||
if (copy_to_user(to, ch->chunks, len))
|
||||
return -EFAULT;
|
||||
|
||||
|
Reference in New Issue
Block a user