aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2023-09-08 11:49:48 +1000
committerStefano Brivio <sbrivio@redhat.com>2023-09-08 09:16:07 +0200
commit805dd109a4aaf851d7293d25bad259493836ce5a (patch)
treeed78bf0cdd01e021713f6e6e7bd3f9920d2cd204
parent7b56117dae0f19c176d852ec7ee1f01937a994c7 (diff)
downloadpasst-805dd109a4aaf851d7293d25bad259493836ce5a.tar
passt-805dd109a4aaf851d7293d25bad259493836ce5a.tar.gz
passt-805dd109a4aaf851d7293d25bad259493836ce5a.tar.bz2
passt-805dd109a4aaf851d7293d25bad259493836ce5a.tar.lz
passt-805dd109a4aaf851d7293d25bad259493836ce5a.tar.xz
passt-805dd109a4aaf851d7293d25bad259493836ce5a.tar.zst
passt-805dd109a4aaf851d7293d25bad259493836ce5a.zip
tcp: Remove some redundant packet_get() operations
Both tcp_data_from_tap() and tcp_tap_handler() call packet_get() to get the entire L4 packet length, then immediately call it again to check that the packet is long enough to include a TCP header. The features of packet_get() let us easily combine these together, we just need to adjust the length slightly, because we want the value to include the TCP header length. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--tcp.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/tcp.c b/tcp.c
index d8c2327..6a34f82 100644
--- a/tcp.c
+++ b/tcp.c
@@ -2320,16 +2320,12 @@ static void tcp_data_from_tap(struct ctx *c, struct tcp_tap_conn *conn,
char *data;
size_t off;
- if (!packet_get(p, i, 0, 0, &len)) {
- tcp_rst(c, conn);
- return;
- }
-
- th = packet_get(p, i, 0, sizeof(*th), NULL);
+ th = packet_get(p, i, 0, sizeof(*th), &len);
if (!th) {
tcp_rst(c, conn);
return;
}
+ len += sizeof(*th);
off = th->doff * 4UL;
if (off < sizeof(*th) || off > len) {
@@ -2545,12 +2541,10 @@ int tcp_tap_handler(struct ctx *c, int af, const void *saddr, const void *daddr,
int ack_due = 0;
char *opts;
- if (!packet_get(p, idx, 0, 0, &len))
- return 1;
-
- th = packet_get(p, idx, 0, sizeof(*th), NULL);
+ th = packet_get(p, idx, 0, sizeof(*th), &len);
if (!th)
return 1;
+ len += sizeof(*th);
optlen = th->doff * 4UL - sizeof(*th);
/* Static checkers might fail to see this: */