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

sctp: improve handling of assoc ids in socket options

Browse Source 
For socket options related to local and remote addresses providing
generic association ids does not make sense. Report EINVAL in this
case.

MFC after:	1 week
This commit is contained in:
Michael Tuexen 2021-12-01 14:54:55 +01:00
parent 6e9309bd3b
commit 13c196a41e
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/netinet/sctp_usrreq.c
View File

@ -2187,8 +2187,13 @@ flags_out:
*value = (uint32_t)size;
*optsize = sizeof(uint32_t);
} else {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOTCONN);
error = ENOTCONN;
if ((inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) &&
((sctp_assoc_t)*value <= SCTP_ALL_ASSOC)) {
error = EINVAL;
} else {
error = ENOENT;
}
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, error);
}
break;
}
@ -2262,8 +2267,13 @@ flags_out:
}
SCTP_TCB_UNLOCK(stcb);
} else {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOENT);
error = ENOENT;
if ((inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) &&
(saddr->sget_assoc_id <= SCTP_ALL_ASSOC)) {
error = EINVAL;
} else {
error = ENOENT;
}
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, error);
}
break;
}
@ -2275,12 +2285,18 @@ flags_out:
SCTP_CHECK_AND_CAST(saddr, optval, struct sctp_getaddresses, *optsize);
SCTP_FIND_STCB(inp, stcb, saddr->sget_assoc_id);
limit = *optsize - offsetof(struct sctp_getaddresses, addr);
actual = sctp_fill_up_addresses(inp, stcb, limit, &saddr->addr[0].sa);
if ((inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) &&
((saddr->sget_assoc_id == SCTP_CURRENT_ASSOC) ||
(saddr->sget_assoc_id == SCTP_ALL_ASSOC))) {
error = EINVAL;
} else {
limit = *optsize - offsetof(struct sctp_getaddresses, addr);
actual = sctp_fill_up_addresses(inp, stcb, limit, &saddr->addr[0].sa);
*optsize = offsetof(struct sctp_getaddresses, addr) + actual;
}
if (stcb != NULL) {
SCTP_TCB_UNLOCK(stcb);
}
*optsize = offsetof(struct sctp_getaddresses, addr) + actual;
break;
}
case SCTP_PEER_ADDR_PARAMS: