Tom Parkin 359e54a93a l2tp: pass correct message length to ip6_append_data
l2tp_ip6_sendmsg needs to avoid accounting for the transport header
twice when splicing more data into an already partially-occupied skbuff.

To manage this, we check whether the skbuff contains data using
skb_queue_empty when deciding how much data to append using
ip6_append_data.

However, the code which performed the calculation was incorrect:

     ulen = len + skb_queue_empty(&sk->sk_write_queue) ? transhdrlen : 0;

...due to C operator precedence, this ends up setting ulen to
transhdrlen for messages with a non-zero length, which results in
corrupted packets on the wire.

Add parentheses to correct the calculation in line with the original
intent.

Fixes: 9d4c75800f61 ("ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()")
Cc: David Howells <dhowells@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240220122156.43131-1-tparkin@katalix.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2024-02-22 10:42:17 +01:00
..
2024-01-18 11:37:24 -08:00
2023-12-15 16:25:55 -08:00
2024-02-22 10:04:47 +01:00
2023-12-26 20:31:01 +00:00
2024-02-21 17:11:04 -08:00
2024-01-11 10:07:29 -08:00
2024-01-03 18:37:22 -08:00
2023-12-26 20:31:01 +00:00
2023-12-12 14:24:14 +01:00
2024-01-04 10:23:10 -08:00
2024-01-04 10:23:10 -08:00
2024-01-08 11:43:04 -08:00