Date: Fri, 14 Nov 2014 06:02:29 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274494 - head/sys/kern Message-ID: <201411140602.sAE62Tdu031281@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Nov 14 06:02:29 2014 New Revision: 274494 URL: https://svnweb.freebsd.org/changeset/base/274494 Log: There should not be zero length mbufs in socket buffers. The code comes from r1451, and thus can't be explained. A patch with explicit panic() here survived all tests. Tested by: pho Sponsored by: Nginx, Inc. Modified: head/sys/kern/uipc_sockbuf.c Modified: head/sys/kern/uipc_sockbuf.c ============================================================================== --- head/sys/kern/uipc_sockbuf.c Fri Nov 14 04:26:26 2014 (r274493) +++ head/sys/kern/uipc_sockbuf.c Fri Nov 14 06:02:29 2014 (r274494) @@ -905,13 +905,6 @@ sbcut_internal(struct sockbuf *sb, int l mfree = m; m = n; } - while (m && m->m_len == 0) { - sbfree(sb, m); - n = m->m_next; - m->m_next = mfree; - mfree = m; - m = n; - } if (m) { sb->sb_mb = m; m->m_nextpkt = next;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411140602.sAE62Tdu031281>