Commit 81e34930 authored Jul 04, 2018 by xinhua.Cao Committed by Paolo Bonzini Jul 06, 2018

qemu-char: check errno together with ret < 0



In the tcp_chr_write function, we checked errno,
but errno was not reset before a read or write operation.
Therefore, this check of errno's actions is often
incorrect after EAGAIN has occurred.
we need check errno together with ret < 0.

Signed-off-by: xinhua.Cao <caoxinhua@huawei.com>
Message-Id: <20180704033642.15996-1-caoxinhua@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Fixes: 9fc53a10
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 02693cc4

chardev/char-socket.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -134,8 +134,11 @@ static int tcp_chr_write(Chardev chr, const uint8_t buf, int len)
		s->write_msgfds,
		s->write_msgfds_num);

		/* free the written msgfds in any cases other than errno==EAGAIN */
		if (EAGAIN != errno && s->write_msgfds_num) {
		/* free the written msgfds in any cases
		* other than ret < 0 && errno == EAGAIN
		*/
		if (!(ret < 0 && EAGAIN == errno)
		&& s->write_msgfds_num) {
		g_free(s->write_msgfds);
		s->write_msgfds = 0;
		s->write_msgfds_num = 0;