summaryrefslogtreecommitdiffstats
path: root/include/linux/udp.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2022-08-26 15:39:28 +0100
committerDavid Howells <dhowells@redhat.com>2022-09-01 11:42:12 +0100
commitac56a0b48da86fd1b4389632fb7c4c8a5d86eefa (patch)
treea066ce6fd509bd85b3eefaf8086aee19a3799094 /include/linux/udp.h
parentf612466ebecb12a00d9152344ddda6f6345f04dc (diff)
downloadlinux-stable-ac56a0b48da86fd1b4389632fb7c4c8a5d86eefa.tar.gz
linux-stable-ac56a0b48da86fd1b4389632fb7c4c8a5d86eefa.tar.bz2
linux-stable-ac56a0b48da86fd1b4389632fb7c4c8a5d86eefa.zip
rxrpc: Fix ICMP/ICMP6 error handling
Because rxrpc pretends to be a tunnel on top of a UDP/UDP6 socket, allowing it to siphon off UDP packets early in the handling of received UDP packets thereby avoiding the packet going through the UDP receive queue, it doesn't get ICMP packets through the UDP ->sk_error_report() callback. In fact, it doesn't appear that there's any usable option for getting hold of ICMP packets. Fix this by adding a new UDP encap hook to distribute error messages for UDP tunnels. If the hook is set, then the tunnel driver will be able to see ICMP packets. The hook provides the offset into the packet of the UDP header of the original packet that caused the notification. An alternative would be to call the ->error_handler() hook - but that requires that the skbuff be cloned (as ip_icmp_error() or ipv6_cmp_error() do, though isn't really necessary or desirable in rxrpc's case is we want to parse them there and then, not queue them). Changes ======= ver #3) - Fixed an uninitialised variable. ver #2) - Fixed some missing CONFIG_AF_RXRPC_IPV6 conditionals. Fixes: 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook") Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/linux/udp.h')
-rw-r--r--include/linux/udp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 254a2654400f..e96da4157d04 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -70,6 +70,7 @@ struct udp_sock {
* For encapsulation sockets.
*/
int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
+ void (*encap_err_rcv)(struct sock *sk, struct sk_buff *skb, unsigned int udp_offset);
int (*encap_err_lookup)(struct sock *sk, struct sk_buff *skb);
void (*encap_destroy)(struct sock *sk);