Commit ac37435b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller

sctp: pass a kernel pointer to sctp_setsockopt_default_prinfo

Use the kernel pointer that sctp_setsockopt has available instead of
directly handling the user pointer.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a97fa4f
...@@ -3944,55 +3944,50 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, ...@@ -3944,55 +3944,50 @@ static int sctp_setsockopt_pr_supported(struct sock *sk,
} }
static int sctp_setsockopt_default_prinfo(struct sock *sk, static int sctp_setsockopt_default_prinfo(struct sock *sk,
char __user *optval, struct sctp_default_prinfo *info,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_sock *sp = sctp_sk(sk); struct sctp_sock *sp = sctp_sk(sk);
struct sctp_default_prinfo info;
struct sctp_association *asoc; struct sctp_association *asoc;
int retval = -EINVAL; int retval = -EINVAL;
if (optlen != sizeof(info)) if (optlen != sizeof(*info))
goto out;
if (copy_from_user(&info, optval, sizeof(info))) {
retval = -EFAULT;
goto out; goto out;
}
if (info.pr_policy & ~SCTP_PR_SCTP_MASK) if (info->pr_policy & ~SCTP_PR_SCTP_MASK)
goto out; goto out;
if (info.pr_policy == SCTP_PR_SCTP_NONE) if (info->pr_policy == SCTP_PR_SCTP_NONE)
info.pr_value = 0; info->pr_value = 0;
asoc = sctp_id2assoc(sk, info.pr_assoc_id); asoc = sctp_id2assoc(sk, info->pr_assoc_id);
if (!asoc && info.pr_assoc_id > SCTP_ALL_ASSOC && if (!asoc && info->pr_assoc_id > SCTP_ALL_ASSOC &&
sctp_style(sk, UDP)) sctp_style(sk, UDP))
goto out; goto out;
retval = 0; retval = 0;
if (asoc) { if (asoc) {
SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy); SCTP_PR_SET_POLICY(asoc->default_flags, info->pr_policy);
asoc->default_timetolive = info.pr_value; asoc->default_timetolive = info->pr_value;
goto out; goto out;
} }
if (sctp_style(sk, TCP)) if (sctp_style(sk, TCP))
info.pr_assoc_id = SCTP_FUTURE_ASSOC; info->pr_assoc_id = SCTP_FUTURE_ASSOC;
if (info.pr_assoc_id == SCTP_FUTURE_ASSOC || if (info->pr_assoc_id == SCTP_FUTURE_ASSOC ||
info.pr_assoc_id == SCTP_ALL_ASSOC) { info->pr_assoc_id == SCTP_ALL_ASSOC) {
SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy); SCTP_PR_SET_POLICY(sp->default_flags, info->pr_policy);
sp->default_timetolive = info.pr_value; sp->default_timetolive = info->pr_value;
} }
if (info.pr_assoc_id == SCTP_CURRENT_ASSOC || if (info->pr_assoc_id == SCTP_CURRENT_ASSOC ||
info.pr_assoc_id == SCTP_ALL_ASSOC) { info->pr_assoc_id == SCTP_ALL_ASSOC) {
list_for_each_entry(asoc, &sp->ep->asocs, asocs) { list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy); SCTP_PR_SET_POLICY(asoc->default_flags,
asoc->default_timetolive = info.pr_value; info->pr_policy);
asoc->default_timetolive = info->pr_value;
} }
} }
...@@ -4690,7 +4685,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4690,7 +4685,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_pr_supported(sk, kopt, optlen); retval = sctp_setsockopt_pr_supported(sk, kopt, optlen);
break; break;
case SCTP_DEFAULT_PRINFO: case SCTP_DEFAULT_PRINFO:
retval = sctp_setsockopt_default_prinfo(sk, optval, optlen); retval = sctp_setsockopt_default_prinfo(sk, kopt, optlen);
break; break;
case SCTP_RECONFIG_SUPPORTED: case SCTP_RECONFIG_SUPPORTED:
retval = sctp_setsockopt_reconfig_supported(sk, optval, optlen); retval = sctp_setsockopt_reconfig_supported(sk, optval, optlen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment