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

soreceive_stream: correctly handle edge cases

Browse Source 
- non NULL controlp is not an error, returning EINVAL
  would cause X forwarding to fail

- MSG_PEEK and MSG_WAITALL are fairly exceptional, but we still
  want to handle them - punt to soreceive_generic
This commit is contained in:
Matt Macy 2018-06-11 16:31:42 +00:00
parent a9336cef39
commit c34bf30069
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=334960
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/kern/uipc_socket.c
View File

@ -2162,7 +2162,6 @@ soreceive_generic(struct socket *so, struct sockaddr **psa, struct uio *uio,
/*
* Optimized version of soreceive() for stream (TCP) sockets.
* XXXAO: (MSG_WAITALL | MSG_PEEK) isn't properly handled.
*/
int
soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
@ -2177,12 +2176,14 @@ soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
return (EINVAL);
if (psa != NULL)
*psa = NULL;
if (controlp != NULL)
return (EINVAL);
if (flagsp != NULL)
flags = *flagsp &~ MSG_EOR;
else
flags = 0;
if (flags & (MSG_PEEK|MSG_WAITALL))
return (soreceive_generic(so, psa, uio, mp0, controlp, flagsp));
if (controlp != NULL)
*controlp = NULL;
if (flags & MSG_OOB)
return (soreceive_rcvoob(so, uio, flags));
if (mp0 != NULL)