diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-02-22 09:28:06 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-02-22 09:28:07 +0100 |
| commit | 39a4cd5a3a32fe61716cfcaae1a01f9e5ee4971c (patch) | |
| tree | cc325a934f11610a55fbc919a38a81c36dbd7cce /net | |
| parent | phonet/pep: fix racy skb_queue_empty() use (diff) | |
| parent | selftests: ioam: refactoring to align with the fix (diff) | |
| download | linux-39a4cd5a3a32fe61716cfcaae1a01f9e5ee4971c.tar.gz linux-39a4cd5a3a32fe61716cfcaae1a01f9e5ee4971c.zip | |
Merge branch 'ioam6-fix-write-to-cloned-skb-s'
Justin Iurman says:
====================
ioam6: fix write to cloned skb's
Make sure the IOAM data insertion is not applied on cloned skb's. As a
consequence, ioam selftests needed a refactoring.
====================
Link: https://lore.kernel.org/r/20240219135255.15429-1-justin.iurman@uliege.be
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/exthdrs.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 4952ae792450..02e9ffb63af1 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -177,6 +177,8 @@ static bool ip6_parse_tlv(bool hopbyhop, case IPV6_TLV_IOAM: if (!ipv6_hop_ioam(skb, off)) return false; + + nh = skb_network_header(skb); break; case IPV6_TLV_JUMBO: if (!ipv6_hop_jumbo(skb, off)) @@ -943,6 +945,14 @@ static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff) if (!skb_valid_dst(skb)) ip6_route_input(skb); + /* About to mangle packet header */ + if (skb_ensure_writable(skb, optoff + 2 + hdr->opt_len)) + goto drop; + + /* Trace pointer may have changed */ + trace = (struct ioam6_trace_hdr *)(skb_network_header(skb) + + optoff + sizeof(*hdr)); + ioam6_fill_trace_data(skb, ns, trace, true); break; default: |