d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix and harmonize the validation of PR-SCTP policies.

Browse Source 
Reported by:	Coverity
CID:		1232044
MFC after:	3 days
This commit is contained in:
Michael Tuexen 2014-12-20 21:17:28 +00:00
parent e54c8bda3e
commit b03b5d729a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=275967
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netinet/sctp_usrreq.c
View File

@ -3639,10 +3639,10 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
policy = sprstat->sprstat_policy;
#if defined(SCTP_DETAILED_STR_STATS)
if ((stcb != NULL) &&
(policy != SCTP_PR_SCTP_NONE) &&
(sid < stcb->asoc.streamoutcnt) &&
((policy == SCTP_PR_SCTP_ALL) ||
(PR_SCTP_VALID_POLICY(policy)))) {
(policy != SCTP_PR_SCTP_NONE) &&
((policy <= SCTP_PR_SCTP_MAX) ||
(policy == SCTP_PR_SCTP_ALL))) {
if (policy == SCTP_PR_SCTP_ALL) {
sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[0];
sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[0];
@ -3652,8 +3652,8 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
}
#else
if ((stcb != NULL) &&
(policy == SCTP_PR_SCTP_ALL) &&
(sid < stcb->asoc.streamoutcnt)) {
(sid < stcb->asoc.streamoutcnt) &&
(policy == SCTP_PR_SCTP_ALL)) {
sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[0];
sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[0];
#endif
@ -3676,8 +3676,8 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
policy = sprstat->sprstat_policy;
if ((stcb != NULL) &&
(policy != SCTP_PR_SCTP_NONE) &&
((policy == SCTP_PR_SCTP_ALL) ||
(PR_SCTP_VALID_POLICY(policy)))) {
((policy <= SCTP_PR_SCTP_MAX) ||
(policy == SCTP_PR_SCTP_ALL))) {
if (policy == SCTP_PR_SCTP_ALL) {
sprstat->sprstat_abandoned_unsent = stcb->asoc.abandoned_unsent[0];
sprstat->sprstat_abandoned_sent = stcb->asoc.abandoned_sent[0];
@ -6038,7 +6038,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
SCTP_CHECK_AND_CAST(info, optval, struct sctp_default_prinfo, optsize);
SCTP_FIND_STCB(inp, stcb, info->pr_assoc_id);
if (PR_SCTP_INVALID_POLICY(info->pr_policy)) {
if (info->pr_policy > SCTP_PR_SCTP_MAX) {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
break;