| commit | 8d050580b2be1a8a6afc793aab0c711b97e62215 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Sep 08 19:04:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 08 19:04:20 2023 +0000 |
| tree | 9c273998fc7fc7a51126ef3f234300c5ff7c0ecf | |
| parent | 624a3346ee356b7e92f4423f9034a1bc49e134fa [diff] | |
| parent | fb6caae204a0bba92bd3873b456158bb8b5ca636 [diff] |
Merge "possibly fix clat ingress nat64 drop" into main am: cc677b3116 am: fb6caae204 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745950 Change-Id: I5ee53066df39586ca2e56164884f1de750fadc20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bpf_progs/clatd.c b/bpf_progs/clatd.c index a104084..8f0ff84 100644 --- a/bpf_progs/clatd.c +++ b/bpf_progs/clatd.c
@@ -240,6 +240,8 @@ return TC_ACT_SHOT; } + try_make_writable(skb, l2_header_size + sizeof(struct iphdr)); + // bpf_skb_change_proto() invalidates all pointers - reload them. data = (void*)(long)skb->data; data_end = (void*)(long)skb->data_end;