From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 11 May 2017 00:04:02 +0000 (-0400)
Subject: pimd: Ensure a 0 read fails cleanly
X-Git-Tag: frr-4.0-dev~468^2~144
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=61e99c94aeb045a0c2d3280594a39bac1b593709;p=mirror%2Ffrr.git

pimd: Ensure a 0 read fails cleanly

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 70dc38c714..bd9fbcf425 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -620,7 +620,7 @@ static int mroute_read(struct thread *t)
 
 	while (cont) {
 		rd = read(fd, buf, sizeof(buf));
-		if (rd < 0) {
+		if (rd <= 0) {
 			if (errno == EINTR)
 				continue;
 			if (errno == EWOULDBLOCK || errno == EAGAIN)
@@ -628,8 +628,8 @@ static int mroute_read(struct thread *t)
 
 			if (PIM_DEBUG_MROUTE)
 				zlog_warn(
-					"%s: failure reading fd=%d: errno=%d: %s",
-					__PRETTY_FUNCTION__, fd, errno,
+					"%s: failure reading rd=%d: fd=%d: errno=%d: %s",
+					__PRETTY_FUNCTION__, rd, fd, errno,
 					safe_strerror(errno));
 			goto done;
 		}