Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
David S. Miller committed Jun 29, 2007
2 parents 0db3dc7 + 5131a18 commit 2524363
Showing 1 changed file with 81 additions and 39 deletions.
120 changes: 81 additions & 39 deletions net/sctp/socket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3375,12 +3375,13 @@ static int sctp_getsockopt_sctp_status(struct sock *sk, int len,
sctp_assoc_t associd;
int retval = 0;

if (len != sizeof(status)) {
if (len < sizeof(status)) {
retval = -EINVAL;
goto out;
}

if (copy_from_user(&status, optval, sizeof(status))) {
len = sizeof(status);
if (copy_from_user(&status, optval, len)) {
retval = -EFAULT;
goto out;
}
Expand Down Expand Up @@ -3452,12 +3453,13 @@ static int sctp_getsockopt_peer_addr_info(struct sock *sk, int len,
struct sctp_transport *transport;
int retval = 0;

if (len != sizeof(pinfo)) {
if (len < sizeof(pinfo)) {
retval = -EINVAL;
goto out;
}

if (copy_from_user(&pinfo, optval, sizeof(pinfo))) {
len = sizeof(pinfo);
if (copy_from_user(&pinfo, optval, len)) {
retval = -EFAULT;
goto out;
}
Expand Down Expand Up @@ -3523,8 +3525,11 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
int __user *optlen)
{
if (len != sizeof(struct sctp_event_subscribe))
if (len < sizeof(struct sctp_event_subscribe))
return -EINVAL;
len = sizeof(struct sctp_event_subscribe);
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
return -EFAULT;
return 0;
Expand All @@ -3546,9 +3551,12 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
/* Applicable to UDP-style socket only */
if (sctp_style(sk, TCP))
return -EOPNOTSUPP;
if (len != sizeof(int))
if (len < sizeof(int))
return -EINVAL;
if (copy_to_user(optval, &sctp_sk(sk)->autoclose, len))
len = sizeof(int);
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
return -EFAULT;
return 0;
}
Expand Down Expand Up @@ -3599,8 +3607,9 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
int retval = 0;
struct sctp_association *asoc;

if (len != sizeof(sctp_peeloff_arg_t))
if (len < sizeof(sctp_peeloff_arg_t))
return -EINVAL;
len = sizeof(sctp_peeloff_arg_t);
if (copy_from_user(&peeloff, optval, len))
return -EFAULT;

Expand Down Expand Up @@ -3628,6 +3637,8 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval

/* Return the fd mapped to the new socket. */
peeloff.sd = retval;
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &peeloff, len))
retval = -EFAULT;

Expand Down Expand Up @@ -3736,9 +3747,9 @@ static int sctp_getsockopt_peer_addr_params(struct sock *sk, int len,
struct sctp_association *asoc = NULL;
struct sctp_sock *sp = sctp_sk(sk);

if (len != sizeof(struct sctp_paddrparams))
if (len < sizeof(struct sctp_paddrparams))
return -EINVAL;

len = sizeof(struct sctp_paddrparams);
if (copy_from_user(&params, optval, len))
return -EFAULT;

Expand Down Expand Up @@ -3837,9 +3848,11 @@ static int sctp_getsockopt_delayed_ack_time(struct sock *sk, int len,
struct sctp_association *asoc = NULL;
struct sctp_sock *sp = sctp_sk(sk);

if (len != sizeof(struct sctp_assoc_value))
if (len < sizeof(struct sctp_assoc_value))
return - EINVAL;

len = sizeof(struct sctp_assoc_value);

if (copy_from_user(&params, optval, len))
return -EFAULT;

Expand Down Expand Up @@ -3888,8 +3901,11 @@ static int sctp_getsockopt_delayed_ack_time(struct sock *sk, int len,
*/
static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
if (len != sizeof(struct sctp_initmsg))
if (len < sizeof(struct sctp_initmsg))
return -EINVAL;
len = sizeof(struct sctp_initmsg);
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
return -EFAULT;
return 0;
Expand All @@ -3904,7 +3920,7 @@ static int sctp_getsockopt_peer_addrs_num_old(struct sock *sk, int len,
struct list_head *pos;
int cnt = 0;

if (len != sizeof(sctp_assoc_t))
if (len < sizeof(sctp_assoc_t))
return -EINVAL;

if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))
Expand Down Expand Up @@ -3940,10 +3956,12 @@ static int sctp_getsockopt_peer_addrs_old(struct sock *sk, int len,
struct sctp_sock *sp = sctp_sk(sk);
int addrlen;

if (len != sizeof(struct sctp_getaddrs_old))
if (len < sizeof(struct sctp_getaddrs_old))
return -EINVAL;

if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs_old)))
len = sizeof(struct sctp_getaddrs_old);

if (copy_from_user(&getaddrs, optval, len))
return -EFAULT;

if (getaddrs.addr_num <= 0) return -EINVAL;
Expand All @@ -3966,7 +3984,9 @@ static int sctp_getsockopt_peer_addrs_old(struct sock *sk, int len,
if (cnt >= getaddrs.addr_num) break;
}
getaddrs.addr_num = cnt;
if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs_old)))
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &getaddrs, len))
return -EFAULT;

return 0;
Expand Down Expand Up @@ -3999,8 +4019,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
return -EINVAL;

to = optval + offsetof(struct sctp_getaddrs,addrs);
space_left = len - sizeof(struct sctp_getaddrs) -
offsetof(struct sctp_getaddrs,addrs);
space_left = len - offsetof(struct sctp_getaddrs,addrs);

list_for_each(pos, &asoc->peer.transport_addr_list) {
from = list_entry(pos, struct sctp_transport, transports);
Expand Down Expand Up @@ -4037,7 +4056,7 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
rwlock_t *addr_lock;
int cnt = 0;

if (len != sizeof(sctp_assoc_t))
if (len < sizeof(sctp_assoc_t))
return -EINVAL;

if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))
Expand Down Expand Up @@ -4179,10 +4198,11 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
void *buf;
int bytes_copied = 0;

if (len != sizeof(struct sctp_getaddrs_old))
if (len < sizeof(struct sctp_getaddrs_old))
return -EINVAL;

if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs_old)))
len = sizeof(struct sctp_getaddrs_old);
if (copy_from_user(&getaddrs, optval, len))
return -EFAULT;

if (getaddrs.addr_num <= 0) return -EINVAL;
Expand Down Expand Up @@ -4254,7 +4274,7 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,

/* copy the leading structure back to user */
getaddrs.addr_num = cnt;
if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs_old)))
if (copy_to_user(optval, &getaddrs, len))
err = -EFAULT;

error:
Expand Down Expand Up @@ -4282,7 +4302,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
void *addrs;
void *buf;

if (len <= sizeof(struct sctp_getaddrs))
if (len < sizeof(struct sctp_getaddrs))
return -EINVAL;

if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
Expand All @@ -4306,8 +4326,8 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
}

to = optval + offsetof(struct sctp_getaddrs,addrs);
space_left = len - sizeof(struct sctp_getaddrs) -
offsetof(struct sctp_getaddrs,addrs);
space_left = len - offsetof(struct sctp_getaddrs,addrs);

addrs = kmalloc(space_left, GFP_KERNEL);
if (!addrs)
return -ENOMEM;
Expand Down Expand Up @@ -4379,10 +4399,12 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
struct sctp_association *asoc;
struct sctp_sock *sp = sctp_sk(sk);

if (len != sizeof(struct sctp_prim))
if (len < sizeof(struct sctp_prim))
return -EINVAL;

if (copy_from_user(&prim, optval, sizeof(struct sctp_prim)))
len = sizeof(struct sctp_prim);

if (copy_from_user(&prim, optval, len))
return -EFAULT;

asoc = sctp_id2assoc(sk, prim.ssp_assoc_id);
Expand All @@ -4398,7 +4420,9 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp,
(union sctp_addr *)&prim.ssp_addr);

if (copy_to_user(optval, &prim, sizeof(struct sctp_prim)))
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &prim, len))
return -EFAULT;

return 0;
Expand All @@ -4415,10 +4439,15 @@ static int sctp_getsockopt_adaptation_layer(struct sock *sk, int len,
{
struct sctp_setadaptation adaptation;

if (len != sizeof(struct sctp_setadaptation))
if (len < sizeof(struct sctp_setadaptation))
return -EINVAL;

len = sizeof(struct sctp_setadaptation);

adaptation.ssb_adaptation_ind = sctp_sk(sk)->adaptation_ind;

if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &adaptation, len))
return -EFAULT;

Expand Down Expand Up @@ -4452,9 +4481,12 @@ static int sctp_getsockopt_default_send_param(struct sock *sk,
struct sctp_association *asoc;
struct sctp_sock *sp = sctp_sk(sk);

if (len != sizeof(struct sctp_sndrcvinfo))
if (len < sizeof(struct sctp_sndrcvinfo))
return -EINVAL;
if (copy_from_user(&info, optval, sizeof(struct sctp_sndrcvinfo)))

len = sizeof(struct sctp_sndrcvinfo);

if (copy_from_user(&info, optval, len))
return -EFAULT;

asoc = sctp_id2assoc(sk, info.sinfo_assoc_id);
Expand All @@ -4475,7 +4507,9 @@ static int sctp_getsockopt_default_send_param(struct sock *sk,
info.sinfo_timetolive = sp->default_timetolive;
}

if (copy_to_user(optval, &info, sizeof(struct sctp_sndrcvinfo)))
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &info, len))
return -EFAULT;

return 0;
Expand Down Expand Up @@ -4526,10 +4560,12 @@ static int sctp_getsockopt_rtoinfo(struct sock *sk, int len,
struct sctp_rtoinfo rtoinfo;
struct sctp_association *asoc;

if (len != sizeof (struct sctp_rtoinfo))
if (len < sizeof (struct sctp_rtoinfo))
return -EINVAL;

if (copy_from_user(&rtoinfo, optval, sizeof (struct sctp_rtoinfo)))
len = sizeof(struct sctp_rtoinfo);

if (copy_from_user(&rtoinfo, optval, len))
return -EFAULT;

asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
Expand Down Expand Up @@ -4581,11 +4617,12 @@ static int sctp_getsockopt_associnfo(struct sock *sk, int len,
struct list_head *pos;
int cnt = 0;

if (len != sizeof (struct sctp_assocparams))
if (len < sizeof (struct sctp_assocparams))
return -EINVAL;

if (copy_from_user(&assocparams, optval,
sizeof (struct sctp_assocparams)))
len = sizeof(struct sctp_assocparams);

if (copy_from_user(&assocparams, optval, len))
return -EFAULT;

asoc = sctp_id2assoc(sk, assocparams.sasoc_assoc_id);
Expand Down Expand Up @@ -4671,9 +4708,11 @@ static int sctp_getsockopt_context(struct sock *sk, int len,
struct sctp_sock *sp;
struct sctp_association *asoc;

if (len != sizeof(struct sctp_assoc_value))
if (len < sizeof(struct sctp_assoc_value))
return -EINVAL;

len = sizeof(struct sctp_assoc_value);

if (copy_from_user(&params, optval, len))
return -EFAULT;

Expand Down Expand Up @@ -6084,8 +6123,11 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
* queued to the backlog. This prevents a potential race between
* backlog processing on the old socket and new-packet processing
* on the new socket.
*
* The caller has just allocated newsk so we can guarantee that other
* paths won't try to lock it and then oldsk.
*/
sctp_lock_sock(newsk);
lock_sock_nested(newsk, SINGLE_DEPTH_NESTING);
sctp_assoc_migrate(assoc, newsk);

/* If the association on the newsk is already closed before accept()
Expand Down

0 comments on commit 2524363

Please sign in to comment.