|
 |
425d11 |
From acee5d39d24b102e8ed09a242cb1c53246a1fb7f Mon Sep 17 00:00:00 2001
|
|
|
425d11 |
From: Jerome Marchand <jmarchan@redhat.com>
|
|
|
425d11 |
Date: Tue, 29 Nov 2022 15:33:49 +0100
|
|
|
425d11 |
Subject: [PATCH] Revert "tools/tcpaccept: Fix support for v5.6+ kernels"
|
|
|
425d11 |
|
|
|
425d11 |
This reverts commit 28955512d991ee3849c2a9accfc54bef9cd35f21.
|
|
|
425d11 |
|
|
|
425d11 |
It breaks tcpaccept on RHEL 8 kernel.
|
|
|
425d11 |
---
|
|
|
425d11 |
tools/tcpaccept.py | 9 ++-------
|
|
|
425d11 |
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
425d11 |
|
|
|
425d11 |
diff --git a/tools/tcpaccept.py b/tools/tcpaccept.py
|
|
|
425d11 |
index b2ace4fa..d3e44143 100755
|
|
|
425d11 |
--- a/tools/tcpaccept.py
|
|
|
425d11 |
+++ b/tools/tcpaccept.py
|
|
|
425d11 |
@@ -116,7 +116,7 @@ int kretprobe__inet_csk_accept(struct pt_regs *ctx)
|
|
|
425d11 |
return 0;
|
|
|
425d11 |
|
|
|
425d11 |
// check this is TCP
|
|
|
425d11 |
- u16 protocol = 0;
|
|
|
425d11 |
+ u8 protocol = 0;
|
|
|
425d11 |
// workaround for reading the sk_protocol bitfield:
|
|
|
425d11 |
|
|
|
425d11 |
// Following comments add by Joe Yin:
|
|
|
425d11 |
@@ -132,12 +132,7 @@ int kretprobe__inet_csk_accept(struct pt_regs *ctx)
|
|
|
425d11 |
int gso_max_segs_offset = offsetof(struct sock, sk_gso_max_segs);
|
|
|
425d11 |
int sk_lingertime_offset = offsetof(struct sock, sk_lingertime);
|
|
|
425d11 |
|
|
|
425d11 |
-
|
|
|
425d11 |
- // Since kernel v5.6 sk_protocol is its own u16 field and gso_max_segs
|
|
|
425d11 |
- // precedes sk_lingertime.
|
|
|
425d11 |
- if (sk_lingertime_offset - gso_max_segs_offset == 2)
|
|
|
425d11 |
- protocol = newsk->sk_protocol;
|
|
|
425d11 |
- else if (sk_lingertime_offset - gso_max_segs_offset == 4)
|
|
|
425d11 |
+ if (sk_lingertime_offset - gso_max_segs_offset == 4)
|
|
|
425d11 |
// 4.10+ with little endian
|
|
|
425d11 |
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
|
|
425d11 |
protocol = *(u8 *)((u64)&newsk->sk_gso_max_segs - 3);
|
|
|
425d11 |
--
|
|
|
425d11 |
2.38.1
|
|
|
425d11 |
|