Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Nov 2016 01:41:43 +0000 (UTC)
From:      Jakub Wojciech Klama <jceel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r308566 - head/sys/dev/virtio/console
Message-ID:  <201611120141.uAC1fh2J049369@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jceel
Date: Sat Nov 12 01:41:43 2016
New Revision: 308566
URL: https://svnweb.freebsd.org/changeset/base/308566

Log:
  Reserve space for control message payload (currently a port name).
  
  Approved by:	trasz (mentor)
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/dev/virtio/console/virtio_console.c

Modified: head/sys/dev/virtio/console/virtio_console.c
==============================================================================
--- head/sys/dev/virtio/console/virtio_console.c	Sat Nov 12 00:23:09 2016	(r308565)
+++ head/sys/dev/virtio/console/virtio_console.c	Sat Nov 12 01:41:43 2016	(r308566)
@@ -600,7 +600,7 @@ vtcon_ctrl_event_enqueue(struct vtcon_so
 
 	sglist_init(&sg, 2, segs);
 	error = sglist_append(&sg, control,
-	    sizeof(struct virtio_console_control));
+	    sizeof(struct virtio_console_control) + VTCON_BULK_BUFSZ);
 	KASSERT(error == 0, ("%s: error %d adding control to sglist",
 	    __func__, error));
 
@@ -633,7 +633,8 @@ vtcon_ctrl_event_requeue(struct vtcon_so
 {
 	int error;
 
-	bzero(control, sizeof(struct virtio_console_control));
+	bzero(control, sizeof(struct virtio_console_control) +
+	    VTCON_BULK_BUFSZ);
 
 	error = vtcon_ctrl_event_enqueue(sc, control);
 	KASSERT(error == 0,



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