ctdb-common: Fix the TCP packet length check

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13520

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/common/system_socket.c b/ctdb/common/system_socket.c
index 562b2bf1aafff73d8914d5f86b675114fb4d9e69..22776f73ea557ab0852a50601e8532d081fa55b8 100644 (file)
--- a/ctdb/common/system_socket.c
+++ b/ctdb/common/system_socket.c
@@ -775,7 +775,7 @@ int ctdb_sys_read_tcp_packet(int s,
 
                /* make sure its not a short packet */
                if (offsetof(struct tcphdr, th_ack) + 4 +
-                   (ip->ip_hl*4) > ret) {
+                   (ip->ip_hl*4) > pkthdr.len) {
                        return -1;
                }
                /* TCP */