Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return EMSGSIZE rather than ENOMEM if it would not be possible to

Browse Source 
allocate space for accrights within stackgap
comment the copyin() of msg.msg_control in recvmsg() is safe
This commit is contained in:
jdolecek 2001-07-22 13:46:51 +00:00
parent a9356936b4
commit 85fbcb3c05
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/compat/common/uipc_syscalls_43.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_syscalls_43.c,v 1.15 2001/07/17 11:49:40 jdolecek Exp $ */ /* $NetBSD: uipc_syscalls_43.c,v 1.16 2001/07/22 13:46:51 jdolecek Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1989, 1990, 1993 * Copyright (c) 1982, 1986, 1989, 1990, 1993
@ -241,7 +241,7 @@ compat_43_sys_recvmsg(p, v, retval)
ucmsg = stackgap_alloc(&sg, CMSG_SPACE(omsg.msg_accrightslen)); ucmsg = stackgap_alloc(&sg, CMSG_SPACE(omsg.msg_accrightslen));
if (ucmsg == NULL) if (ucmsg == NULL)
return (ENOMEM); return (EMSGSIZE);
msg.msg_control = ucmsg; msg.msg_control = ucmsg;
msg.msg_controllen = CMSG_SPACE(omsg.msg_accrightslen); msg.msg_controllen = CMSG_SPACE(omsg.msg_accrightslen);
@ -260,6 +260,7 @@ compat_43_sys_recvmsg(p, v, retval)
if (!error && omsg.msg_accrights && msg.msg_controllen > 0) { if (!error && omsg.msg_accrights && msg.msg_controllen > 0) {
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
/* safe - msg.msg_controllen set by kernel */
cmsg = (struct cmsghdr *) malloc(msg.msg_controllen, cmsg = (struct cmsghdr *) malloc(msg.msg_controllen,
M_TEMP, M_WAITOK); M_TEMP, M_WAITOK);
@ -419,7 +420,7 @@ compat_43_sys_sendmsg(p, v, retval)
ucmsg = stackgap_alloc(&sg, CMSG_SPACE(omsg.msg_accrightslen)); ucmsg = stackgap_alloc(&sg, CMSG_SPACE(omsg.msg_accrightslen));
if (!ucmsg) { if (!ucmsg) {
free(cmsg, M_TEMP); free(cmsg, M_TEMP);
return (ENOMEM); return (EMSGSIZE);
} }
(void) copyout(cmsg, ucmsg, CMSG_SPACE(omsg.msg_accrightslen)); (void) copyout(cmsg, ucmsg, CMSG_SPACE(omsg.msg_accrightslen));