Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Nov 2014 14:47:45 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r274713 - projects/sendfile/sys/kern
Message-ID:  <201411191447.sAJEljwT028307@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Wed Nov 19 14:47:44 2014
New Revision: 274713
URL: https://svnweb.freebsd.org/changeset/base/274713

Log:
  Add check to sbcheck() for empty mbufs on buffer.
  
  Sponsored by:	Nginx, Inc.

Modified:
  projects/sendfile/sys/kern/uipc_sockbuf.c

Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c	Wed Nov 19 14:27:38 2014	(r274712)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c	Wed Nov 19 14:47:44 2014	(r274713)
@@ -683,6 +683,10 @@ sbcheck(struct sockbuf *sb, const char *
 	for (m = sb->sb_mb; m; m = n) {
 	    n = m->m_nextpkt;
 	    for (; m; m = m->m_next) {
+		if (m->m_len == 0) {
+			printf("sb %p empty mbuf %p\n", sb, m);
+			goto fail;
+		}
 		if ((m->m_flags & M_NOTREADY) && fnrdy == NULL) {
 			if (m != sb->sb_fnrdy) {
 				printf("sb %p: fnrdy %p != m %p\n",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411191447.sAJEljwT028307>