nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_SNDINFO sockopt

Browse source 
Check with SCTP_ALL_ASSOC instead in sctp_setsockopt_default_sndinfo and
check with SCTP_FUTURE_ASSOC instead in sctp_getsockopt_default_sndinfo,
it's compatible with 0.

SCTP_CURRENT_ASSOC is supported for SCTP_DEFAULT_SNDINFO in this patch.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2019-01-28 15:08:36 +08:00 committed by David S. Miller
parent 707e45b3dc
commit 92fc3bd928
1 changed files with 22 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

25
net/sctp/socket.c
View file

@ -3067,20 +3067,37 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk,
return -EINVAL; return -EINVAL;
asoc = sctp_id2assoc(sk, info.snd_assoc_id); asoc = sctp_id2assoc(sk, info.snd_assoc_id);
if (!asoc && info.snd_assoc_id && sctp_style(sk, UDP)) if (!asoc && info.snd_assoc_id > SCTP_ALL_ASSOC &&
sctp_style(sk, UDP))
return -EINVAL; return -EINVAL;
if (asoc) { if (asoc) {
asoc->default_stream = info.snd_sid; asoc->default_stream = info.snd_sid;
asoc->default_flags = info.snd_flags; asoc->default_flags = info.snd_flags;
asoc->default_ppid = info.snd_ppid; asoc->default_ppid = info.snd_ppid;
asoc->default_context = info.snd_context; asoc->default_context = info.snd_context;
} else {
return 0;
}
if (info.snd_assoc_id == SCTP_FUTURE_ASSOC ||
info.snd_assoc_id == SCTP_ALL_ASSOC) {
sp->default_stream = info.snd_sid; sp->default_stream = info.snd_sid;
sp->default_flags = info.snd_flags; sp->default_flags = info.snd_flags;
sp->default_ppid = info.snd_ppid; sp->default_ppid = info.snd_ppid;
sp->default_context = info.snd_context; sp->default_context = info.snd_context;
} }
if (info.snd_assoc_id == SCTP_CURRENT_ASSOC ||
info.snd_assoc_id == SCTP_ALL_ASSOC) {
list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
asoc->default_stream = info.snd_sid;
asoc->default_flags = info.snd_flags;
asoc->default_ppid = info.snd_ppid;
asoc->default_context = info.snd_context;
}
}
return 0; return 0;
} }
@ -6287,8 +6304,10 @@ static int sctp_getsockopt_default_sndinfo(struct sock *sk, int len,
return -EFAULT; return -EFAULT;
asoc = sctp_id2assoc(sk, info.snd_assoc_id); asoc = sctp_id2assoc(sk, info.snd_assoc_id);
if (!asoc && info.snd_assoc_id && sctp_style(sk, UDP)) if (!asoc && info.snd_assoc_id != SCTP_FUTURE_ASSOC &&
sctp_style(sk, UDP))
return -EINVAL; return -EINVAL;
if (asoc) { if (asoc) {
info.snd_sid = asoc->default_stream; info.snd_sid = asoc->default_stream;
info.snd_flags = asoc->default_flags; info.snd_flags = asoc->default_flags;