Date: Sat, 7 Aug 2010 17:57:58 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211030 - head/sys/kern Message-ID: <201008071757.o77HvwcO013563@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Sat Aug 7 17:57:58 2010 New Revision: 211030 URL: http://svn.freebsd.org/changeset/base/211030 Log: Fix a bug where MSG_TRUNC was not returned in all necessary cases for SOCK_DGRAM socket. MSG_TRUNC was only returned when some mbufs could not be copied to the application. If some data was left in the last mbuf, it was correctly discarded, but MSG_TRUNC was not set. Reviewed by: bz MFC after: 3 weeks Modified: head/sys/kern/uipc_socket.c Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Sat Aug 7 17:39:22 2010 (r211029) +++ head/sys/kern/uipc_socket.c Sat Aug 7 17:57:58 2010 (r211030) @@ -2236,7 +2236,12 @@ soreceive_dgram(struct socket *so, struc m_freem(m); return (error); } - m = m_free(m); + if (len == m->m_len) + m = m_free(m); + else { + m->m_data += len; + m->m_len -= len; + } } if (m != NULL) flags |= MSG_TRUNC;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008071757.o77HvwcO013563>