sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_CONTEXT sockopt
Check with SCTP_ALL_ASSOC instead in sctp_setsockopt_context and check with SCTP_FUTURE_ASSOC instead in sctp_getsockopt_context, it's compatible with 0. SCTP_CURRENT_ASSOC is supported for SCTP_CONTEXT in this patch. It also adjusts some code to keep a same check form as other functions. Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
92fc3bd928
Коммит
49b037acca
|
@ -3510,8 +3510,8 @@ static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval
|
||||||
static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
|
static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
|
||||||
unsigned int optlen)
|
unsigned int optlen)
|
||||||
{
|
{
|
||||||
|
struct sctp_sock *sp = sctp_sk(sk);
|
||||||
struct sctp_assoc_value params;
|
struct sctp_assoc_value params;
|
||||||
struct sctp_sock *sp;
|
|
||||||
struct sctp_association *asoc;
|
struct sctp_association *asoc;
|
||||||
|
|
||||||
if (optlen != sizeof(struct sctp_assoc_value))
|
if (optlen != sizeof(struct sctp_assoc_value))
|
||||||
|
@ -3519,17 +3519,26 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
|
||||||
if (copy_from_user(¶ms, optval, optlen))
|
if (copy_from_user(¶ms, optval, optlen))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
||||||
sp = sctp_sk(sk);
|
asoc = sctp_id2assoc(sk, params.assoc_id);
|
||||||
|
if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
|
||||||
|
sctp_style(sk, UDP))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
if (params.assoc_id != 0) {
|
if (asoc) {
|
||||||
asoc = sctp_id2assoc(sk, params.assoc_id);
|
|
||||||
if (!asoc)
|
|
||||||
return -EINVAL;
|
|
||||||
asoc->default_rcv_context = params.assoc_value;
|
asoc->default_rcv_context = params.assoc_value;
|
||||||
} else {
|
|
||||||
sp->default_rcv_context = params.assoc_value;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (params.assoc_id == SCTP_FUTURE_ASSOC ||
|
||||||
|
params.assoc_id == SCTP_ALL_ASSOC)
|
||||||
|
sp->default_rcv_context = params.assoc_value;
|
||||||
|
|
||||||
|
if (params.assoc_id == SCTP_CURRENT_ASSOC ||
|
||||||
|
params.assoc_id == SCTP_ALL_ASSOC)
|
||||||
|
list_for_each_entry(asoc, &sp->ep->asocs, asocs)
|
||||||
|
asoc->default_rcv_context = params.assoc_value;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6517,7 +6526,6 @@ static int sctp_getsockopt_context(struct sock *sk, int len,
|
||||||
char __user *optval, int __user *optlen)
|
char __user *optval, int __user *optlen)
|
||||||
{
|
{
|
||||||
struct sctp_assoc_value params;
|
struct sctp_assoc_value params;
|
||||||
struct sctp_sock *sp;
|
|
||||||
struct sctp_association *asoc;
|
struct sctp_association *asoc;
|
||||||
|
|
||||||
if (len < sizeof(struct sctp_assoc_value))
|
if (len < sizeof(struct sctp_assoc_value))
|
||||||
|
@ -6528,16 +6536,13 @@ static int sctp_getsockopt_context(struct sock *sk, int len,
|
||||||
if (copy_from_user(¶ms, optval, len))
|
if (copy_from_user(¶ms, optval, len))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
||||||
sp = sctp_sk(sk);
|
asoc = sctp_id2assoc(sk, params.assoc_id);
|
||||||
|
if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
|
||||||
|
sctp_style(sk, UDP))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
if (params.assoc_id != 0) {
|
params.assoc_value = asoc ? asoc->default_rcv_context
|
||||||
asoc = sctp_id2assoc(sk, params.assoc_id);
|
: sctp_sk(sk)->default_rcv_context;
|
||||||
if (!asoc)
|
|
||||||
return -EINVAL;
|
|
||||||
params.assoc_value = asoc->default_rcv_context;
|
|
||||||
} else {
|
|
||||||
params.assoc_value = sp->default_rcv_context;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (put_user(len, optlen))
|
if (put_user(len, optlen))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче