dcavalca / rpms / linuxptp

Forked from rpms/linuxptp 2 years ago
Clone

Blame SOURCES/linuxptp-zerolength.patch

fed1e1
commit 9633ab52460f58c92c6daa35e9d24e4ce9c5ab1c
fed1e1
Author: Miroslav Lichvar <mlichvar@redhat.com>
fed1e1
Date:   Tue Feb 23 11:01:43 2021 +0100
7934a2
fed1e1
    sk: Don't return error for zero-length messages.
7934a2
    
fed1e1
    The recvmsg() call can return zero for a zero-length UDP message, which
fed1e1
    should be handled as a bad message and not a fault of the port. This was
fed1e1
    addressed in commit 6b61ba29c78e ("Avoid fault when receiving zero
fed1e1
    length packets"), but later regressed in commit a6e0b83bd503
fed1e1
    ("sk: Convey transmit path errors to the caller.").
7934a2
    
fed1e1
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
fed1e1
    Fixes: a6e0b83bd503 ("sk: Convey transmit path errors to the caller.")
7934a2
7934a2
diff --git a/sk.c b/sk.c
fed1e1
index c9ef4d2..8be0708 100644
7934a2
--- a/sk.c
7934a2
+++ b/sk.c
fed1e1
@@ -391,7 +391,7 @@ int sk_receive(int fd, void *buf, int buflen,
fed1e1
 
fed1e1
 	if (!ts) {
fed1e1
 		memset(&hwts->ts, 0, sizeof(hwts->ts));
fed1e1
-		return cnt < 1 ? -errno : cnt;
fed1e1
+		return cnt < 0 ? -errno : cnt;
7934a2
 	}
7934a2
 
fed1e1
 	switch (hwts->type) {
fed1e1
@@ -407,7 +407,7 @@ int sk_receive(int fd, void *buf, int buflen,
fed1e1
 		hwts->ts = timespec_to_tmv(ts[1]);
fed1e1
 		break;
fed1e1
 	}
fed1e1
-	return cnt < 1 ? -errno : cnt;
fed1e1
+	return cnt < 0 ? -errno : cnt;
fed1e1
 }
7934a2
 
fed1e1
 int sk_set_priority(int fd, int family, uint8_t dscp)