Skip to contentSkip to conversation

add support for RFC 8335 PROBE

PATCH Superseded Andreas Roeseler 3 participants 11 messages Feb 17, 2021 – Feb 25, 2021

Subsystems (3)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover add support for RFC 8335 PROBE

The popular utility ping has several severe limitations such as the inability to query specific interfaces on a node and requiring bidirectional connectivity between the probing and probed interfaces. RFC 8335 attempts to solve these limitations by creating the new utility PROBE which is a specialized ICMP message that makes use of the ICMP Extention Structure outlined in RFC 4884.

This patchset adds definitions for the ICMP Extended Echo Request and Reply (PROBE) types for both IPV4 and IPV6, adds a sysctl to enable response to PROBE messages, expands the list of supported ICMP messages to accommodate PROBE types, and adds functionality to respond to PROBE requests.

Changes since v1:
- Add AFI definitions
- Switch to functions such as dev_get_by_name and ip_dev_find to lookup net devices

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add verification of incoming messages before looking up netdev
- Add prefix for PROBE specific defined variables
- Use proc_dointvec_minmax with zero and one
- Create struct icmp_ext_echo_iio for parsing incoming packet

- Include net/addrconf.h library for ipv6_dev_find

Andreas Roeseler (5):
icmp: add support for RFC 8335 PROBE
ICMPV6: add support for RFC 8335 PROBE
net: add sysctl for enabling RFC 8335 PROBE messages
net: add support for sending RFC 8335 PROBE messages
icmp: add response to RFC 8335 PROBE messages

 include/net/netns/ipv4.h    |   1 +
 include/uapi/linux/icmp.h   |  40 +++++++++++
 include/uapi/linux/icmpv6.h |   6 ++
 net/ipv4/icmp.c             | 133 +++++++++++++++++++++++++++++++++---
 net/ipv4/ping.c             |   4 +-
 net/ipv4/sysctl_net_ipv4.c  |   9 +++
 6 files changed, 181 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 1/5 icmp: add support for RFC 8335 PROBE

Add definitions for PROBE ICMP types and codes.

Add AFI definitions for IP and IPV6 as specified by IANA

Add a struct to represent the additional header when probing by IP address (ctype == 3) for use in parsing incoming PROBE messages.

Add a struct to represent the entire Interface Identification Object (IIO) section of an incoming PROBE packet

---
Changes since v1:
- Add AFI_IP and AFI_IP6 definitions

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add prefix for PROBE specific defined variables
- Create struct icmp_ext_echo_iio for parsing incoming packet

---
 include/uapi/linux/icmp.h | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
include/uapi/linux/icmp.h +40 -0
index fb169a50895e..166ca77561de 100644
@@ -66,6 +66,23 @@
 #define ICMP_EXC_TTL		0	/* TTL count exceeded		*/
 #define ICMP_EXC_FRAGTIME	1	/* Fragment Reass time exceeded	*/
 
+/* Codes for EXT_ECHO (PROBE) */
+#define ICMP_EXT_ECHO		42
+#define ICMP_EXT_ECHOREPLY	43
+#define ICMP_EXT_MAL_QUERY	1	/* Malformed Query */
+#define ICMP_EXT_NO_IF		2	/* No such Interface */
+#define ICMP_EXT_NO_TABLE_ENT	3	/* No such Table Entry */
+#define ICMP_EXT_MULT_IFS	4	/* Multiple Interfaces Satisfy Query */
+
+/* constants for EXT_ECHO (PROBE) */
+#define EXT_ECHOREPLY_ACTIVE	(1 << 2)/* position of active flag in reply */
+#define EXT_ECHOREPLY_IPV4	(1 << 1)/* position of ipv4 flag in reply */
+#define EXT_ECHOREPLY_IPV6	1	/* position of ipv6 flag in reply */
+#define EXT_ECHO_CTYPE_NAME	1
+#define EXT_ECHO_CTYPE_INDEX	2
+#define EXT_ECHO_CTYPE_ADDR	3
+#define EXT_ECHO_AFI_IP		1	/* Address Family Identifier for IPV4 */
+#define EXT_ECHO_AFI_IP6	2	/* Address Family Identifier for IPV6 */
 
 struct icmphdr {
   __u8		type;
@@ -118,4 +135,27 @@ struct icmp_extobj_hdr {
 	__u8		class_type;
 };
 
+/* RFC 8335: 2.1 Header for C-type 3 payload */
+struct icmp_ext_echo_ctype3_hdr {
+	__u16		afi;
+	__u8		addrlen;
+	__u8		reserved;
+};
+
+/* RFC 8335: Interface Identification Object */
+struct icmp_ext_echo_iio {
+	struct icmp_extobj_hdr	extobj_hdr;
+	union {
+		__u32	ifIndex;
+		char name;
+		struct {
+			struct icmp_ext_echo_ctype3_hdr	ctype3_hdr;
+			union {
+				__be32		ipv4_addr;
+				struct in6_addr	ipv6_addr;
+			} ip_addr;
+		} addr;
+	} ident;
+};
+
 #endif /* _UAPI_LINUX_ICMP_H */
Signature · 1 line
2.25.1
#3 lore raw

PATCH v3 2/5 ICMPV6: add support for RFC 8335 PROBE

In reply to Andreas Roeseler

Add definitions for the ICMPV6 type of Extended Echo Request and Extended Echo Reply, as defined in sections 2 and 3 of RFC 8335.

---
 include/uapi/linux/icmpv6.h | 6 ++++++
 1 file changed, 6 insertions(+)
include/uapi/linux/icmpv6.h +6 -0
index 0564fd7ccde4..b2a9017ddb2d 100644
@@ -140,6 +140,12 @@ struct icmp6hdr {
 #define ICMPV6_UNK_OPTION		2
 #define ICMPV6_HDR_INCOMP		3
 
+/*
+ *	Codes for EXT_ECHO (PROBE)
+ */
+#define ICMPV6_EXT_ECHO_REQUEST		160
+#define ICMPV6_EXT_ECHO_REPLY		161
+
 /*
  *	constants for (set|get)sockopt
  */
Signature · 1 line
2.25.1
#4 lore raw

PATCH v3 3/5 net: add sysctl for enabling RFC 8335 PROBE messages

In reply to Andreas Roeseler

Section 8 of RFC 8335 specifies potential security concerns of responding to PROBE requests, and states that nodes that support PROBE functionality MUST be able to enable/disable responses and it is disabled by default.

Add sysctl to enable responses to PROBE messages.

---
Changes since v1:
- Combine patches related to sysctl into one patch

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Use proc_dointvec_minmax with zero and one

---
 include/net/netns/ipv4.h   | 1 +
 net/ipv4/sysctl_net_ipv4.c | 9 +++++++++
 2 files changed, 10 insertions(+)
include/net/netns/ipv4.h +1 -0
index 70a2a085dd1a..362388ab40c8 100644
@@ -85,6 +85,7 @@ struct netns_ipv4 {
 #endif
 
 	int sysctl_icmp_echo_ignore_all;
+	int sysctl_icmp_echo_enable_probe;
 	int sysctl_icmp_echo_ignore_broadcasts;
 	int sysctl_icmp_ignore_bogus_error_responses;
 	int sysctl_icmp_ratelimit;
net/ipv4/sysctl_net_ipv4.c +9 -0
index f55095d3ed16..fec3f142d8c9 100644
@@ -599,6 +599,15 @@ static struct ctl_table ipv4_net_table[] = {
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec
 	},
+	{
+		.procname	= "icmp_echo_enable_probe",
+		.data		= &init_net.ipv4.sysctl_icmp_echo_enable_probe,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= proc_dointvec_minmax,
+		.extra1		= SYSCTL_ZERO,
+		.extra2		= SYSCTL_ONE
+	},
 	{
 		.procname	= "icmp_echo_ignore_broadcasts",
 		.data		= &init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts,
Signature · 1 line
2.25.1
#5 lore raw

PATCH v3 4/5 net: add support for sending RFC 8335 PROBE messages

In reply to Andreas Roeseler

Modify the ping_supported function to support PROBE message types. This allows tools such as the ping command in the iputils package to be modified to send PROBE requests through the existing framework for sending ping requests.

---
 net/ipv4/ping.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/ping.c +3 -1
index 8b943f85fff9..1c9f71a37258 100644
@@ -453,7 +453,9 @@ EXPORT_SYMBOL_GPL(ping_bind);
 static inline int ping_supported(int family, int type, int code)
 {
 	return (family == AF_INET && type == ICMP_ECHO && code == 0) ||
-	       (family == AF_INET6 && type == ICMPV6_ECHO_REQUEST && code == 0);
+	       (family == AF_INET && type == ICMP_EXT_ECHO && code == 0) ||
+	       (family == AF_INET6 && type == ICMPV6_ECHO_REQUEST && code == 0) ||
+	       (family == AF_INET6 && type == ICMPV6_EXT_ECHO_REQUEST && code == 0);
 }
 
 /*
Signature · 1 line
2.25.1
#6 lore raw

PATCH v3 5/5 icmp: add response to RFC 8335 PROBE messages

In reply to Andreas Roeseler

Modify the icmp_rcv function to check for PROBE messages and call icmp_echo if a PROBE request is detected.

Modify the existing icmp_echo function to respond to both ping and PROBE requests.

This was tested using a custom modification of the iputils package and wireshark. It supports IPV4 probing by name, ifindex, and probing by both IPV4 and IPV6 addresses. It currently does not support responding to probes off the proxy node (See RFC 8335 Section 2).

---
Changes since v1:
- Reorder variable declarations to follow coding style
- Switch to functions such as dev_get_by_name and ip_dev_find to lookup net devices

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add verification of incoming messages before looking up netdev

- Include net/addrconf.h library for ipv6_dev_find

---
 net/ipv4/icmp.c | 133 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 122 insertions(+), 11 deletions(-)
net/ipv4/icmp.c +122 -11
index 396b492c804f..3caca9f2aa07 100644
@@ -92,6 +92,7 @@
 #include <net/inet_common.h>
 #include <net/ip_fib.h>
 #include <net/l3mdev.h>
+#include <net/addrconf.h>
 
 /*
  *	Build xmit assembly blocks
@@ -970,7 +971,7 @@ static bool icmp_redirect(struct sk_buff *skb)
 }
 
 /*
- *	Handle ICMP_ECHO ("ping") requests.
+ *	Handle ICMP_ECHO ("ping") and ICMP_EXT_ECHO ("PROBE") requests.
  *
  *	RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
  *		  requests.
@@ -978,26 +979,122 @@ static bool icmp_redirect(struct sk_buff *skb)
  *		  included in the reply.
  *	RFC 1812: 4.3.3.6 SHOULD have a config option for silently ignoring
  *		  echo requests, MUST have default=NOT.
+ *	RFC 8335: 8 MUST have a config option to enable/disable ICMP
+ *		  Extended Echo functionality, MUST be disabled by default
  *	See also WRT handling of options once they are done and working.
  */
 
 static bool icmp_echo(struct sk_buff *skb)
 {
+	struct icmp_ext_echo_iio *iio;
+	struct icmp_ext_hdr *ext_hdr;
+	struct icmp_bxm icmp_param;
+	struct net_device *dev;
 	struct net *net;
+	__u16 ident_len;
+	__u8 status;
+	char *buff;
 
 	net = dev_net(skb_dst(skb)->dev);
-	if (!net->ipv4.sysctl_icmp_echo_ignore_all) {
-		struct icmp_bxm icmp_param;
+	/* should there be an ICMP stat for ignored echos? */
+	if (net->ipv4.sysctl_icmp_echo_ignore_all)
+		return true;
 
-		icmp_param.data.icmph	   = *icmp_hdr(skb);
+	icmp_param.data.icmph		= *icmp_hdr(skb);
+	icmp_param.skb			= skb;
+	icmp_param.offset		= 0;
+	icmp_param.data_len		= skb->len;
+	icmp_param.head_len		= sizeof(struct icmphdr);
+	if (icmp_param.data.icmph.type == ICMP_ECHO) {
 		icmp_param.data.icmph.type = ICMP_ECHOREPLY;
-		icmp_param.skb		   = skb;
-		icmp_param.offset	   = 0;
-		icmp_param.data_len	   = skb->len;
-		icmp_param.head_len	   = sizeof(struct icmphdr);
-		icmp_reply(&icmp_param, skb);
+		goto send_reply;
 	}
-	/* should there be an ICMP stat for ignored echos? */
+	if (!net->ipv4.sysctl_icmp_echo_enable_probe)
+		return true;
+	/* We currently only support probing interfaces on the proxy node
+	 * Check to ensure L-bit is set
+	 */
+	if (!(ntohs(icmp_param.data.icmph.un.echo.sequence) & 1))
+		return true;
+
+	/* Clear status bits in reply message */
+	icmp_param.data.icmph.un.echo.sequence &= htons(0xFF00);
+	icmp_param.data.icmph.type = ICMP_EXT_ECHOREPLY;
+	ext_hdr = (struct icmp_ext_hdr *)(icmp_hdr(skb) + 1);
+	iio = (struct icmp_ext_echo_iio *)(ext_hdr + 1);
+	ident_len = ntohs(iio->extobj_hdr.length) - sizeof(iio->extobj_hdr);
+	status = 0;
+	dev = NULL;
+	switch (iio->extobj_hdr.class_type) {
+	case EXT_ECHO_CTYPE_NAME:
+		if (ident_len >= skb->len - sizeof(struct icmphdr) - sizeof(iio->extobj_hdr)) {
+			icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+			goto send_reply;
+		}
+		buff = kcalloc(ident_len + 1, sizeof(char), GFP_KERNEL);
+		if (!buff)
+			return -ENOMEM;
+		memcpy(buff, &iio->ident.name, ident_len);
+		dev = dev_get_by_name(net, buff);
+		kfree(buff);
+		break;
+	case EXT_ECHO_CTYPE_INDEX:
+		if (ident_len != sizeof(iio->ident.ifIndex)) {
+			icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+			goto send_reply;
+		}
+		dev = dev_get_by_index(net, ntohl(iio->ident.ifIndex));
+		break;
+	case EXT_ECHO_CTYPE_ADDR:
+		switch (ntohs(iio->ident.addr.ctype3_hdr.afi)) {
+		case EXT_ECHO_AFI_IP:
+			if (ident_len != sizeof(iio->ident.addr.ctype3_hdr) + sizeof(__be32) ||
+			    ident_len != sizeof(iio->ident.addr.ctype3_hdr) + iio->ident.addr.ctype3_hdr.addrlen) {
+				icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+				goto send_reply;
+			}
+			dev = ip_dev_find(net, iio->ident.addr.ip_addr.ipv4_addr);
+			break;
+		case EXT_ECHO_AFI_IP6:
+			if (ident_len != sizeof(iio->ident.addr.ctype3_hdr) + sizeof(struct in6_addr) ||
+			    ident_len != sizeof(iio->ident.addr.ctype3_hdr) + iio->ident.addr.ctype3_hdr.addrlen) {
+				icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+				goto send_reply;
+			}
+			dev = ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev);
+			if (dev)
+				dev_hold(dev);
+			break;
+		default:
+			icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+			goto send_reply;
+		}
+		break;
+	default:
+		icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+		goto send_reply;
+	}
+	if (!dev) {
+		icmp_param.data.icmph.code = ICMP_EXT_NO_IF;
+		goto send_reply;
+	}
+	/* RFC 8335: 3 the last 8 bits of the Extended Echo Reply Message
+	 *  are laid out as follows:
+	 *	+-+-+-+-+-+-+-+-+
+	 *	|State|Res|A|4|6|
+	 *	+-+-+-+-+-+-+-+-+
+	 */
+	if (dev->flags & IFF_UP)
+		status |= EXT_ECHOREPLY_ACTIVE;
+	if (dev->ip_ptr->ifa_list)
+		status |= EXT_ECHOREPLY_IPV4;
+	if (!list_empty(&dev->ip6_ptr->addr_list))
+		status |= EXT_ECHOREPLY_IPV6;
+	dev_put(dev);
+	icmp_param.data.icmph.un.echo.sequence |= htons(status);
+
+send_reply:
+	icmp_reply(&icmp_param, skb);
 	return true;
 }
 
@@ -1087,6 +1184,13 @@ int icmp_rcv(struct sk_buff *skb)
 	icmph = icmp_hdr(skb);
 
 	ICMPMSGIN_INC_STATS(net, icmph->type);
+
+	/*
+	 *	Check for ICMP Extended Echo (PROBE) messages
+	 */
+	if (icmph->type == ICMP_EXT_ECHO || icmph->type == ICMPV6_EXT_ECHO_REQUEST)
+		goto probe;
+
 	/*
 	 *	18 is the highest 'known' ICMP type. Anything else is a mystery
 	 *
@@ -1096,7 +1200,6 @@ int icmp_rcv(struct sk_buff *skb)
 	if (icmph->type > NR_ICMP_TYPES)
 		goto error;
 
-
 	/*
 	 *	Parse the ICMP message
 	 */
@@ -1123,6 +1226,7 @@ int icmp_rcv(struct sk_buff *skb)
 
 	success = icmp_pointers[icmph->type].handler(skb);
 
+success_check:
 	if (success)  {
 		consume_skb(skb);
 		return NET_RX_SUCCESS;
@@ -1136,6 +1240,13 @@ int icmp_rcv(struct sk_buff *skb)
 error:
 	__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
 	goto drop;
+probe:
+	/*
+	 * We can't use icmp_pointers[].handler() because the codes for PROBE
+	 *   messages are 42 or 160
+	 */
+	success = icmp_echo(skb);
+	goto success_check;
 }
 
 static bool ip_icmp_error_rfc4884_validate(const struct sk_buff *skb, int off)
Signature · 1 line
2.25.1
maintainer
#10 lore raw
In reply to Andreas Roeseler

From: Andreas Roeseler <[email protected]>
Date: Wed, 17 Feb 2021 10:07:38 -0800

Quoted 24 lines

The popular utility ping has several severe limitations such as the inability to query specific interfaces on a node and requiring bidirectional connectivity between the probing and probed interfaces. RFC 8335 attempts to solve these limitations by creating the new utility PROBE which is a specialized ICMP message that makes use of the ICMP Extention Structure outlined in RFC 4884.

This patchset adds definitions for the ICMP Extended Echo Request and Reply (PROBE) types for both IPV4 and IPV6, adds a sysctl to enable response to PROBE messages, expands the list of supported ICMP messages to accommodate PROBE types, and adds functionality to respond to PROBE requests.

Changes since v1:
- Add AFI definitions
- Switch to functions such as dev_get_by_name and ip_dev_find to lookup net devices

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add verification of incoming messages before looking up netdev
- Add prefix for PROBE specific defined variables
- Use proc_dointvec_minmax with zero and one
- Create struct icmp_ext_echo_iio for parsing incoming packet

Quoted 3 lines

- Include net/addrconf.h library for ipv6_dev_find

Thi is too late for the current merge window, sorry. Please resubmit when net-next opens back up, thank you.

#2 lore raw

Re: [PATCH V3 net-next 1/5] icmp: add support for RFC 8335 PROBE

In reply to Andreas Roeseler
Quoted 58 lines · Andreas Roeseler

Add definitions for PROBE ICMP types and codes.

Add AFI definitions for IP and IPV6 as specified by IANA

Add a struct to represent the additional header when probing by IP address (ctype == 3) for use in parsing incoming PROBE messages.

Add a struct to represent the entire Interface Identification Object (IIO) section of an incoming PROBE packet

---
Changes since v1:
- Add AFI_IP and AFI_IP6 definitions

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add prefix for PROBE specific defined variables
- Create struct icmp_ext_echo_iio for parsing incoming packet

---
 include/uapi/linux/icmp.h | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
include/uapi/linux/icmp.h +19 -0
index fb169a50895e..166ca77561de 100644
@@ -66,6 +66,23 @@
 #define ICMP_EXC_TTL           0       /* TTL count exceeded           */
 #define ICMP_EXC_FRAGTIME      1       /* Fragment Reass time exceeded */
 
+/* Codes for EXT_ECHO (PROBE) */
+#define ICMP_EXT_ECHO          42
+#define ICMP_EXT_ECHOREPLY     43
+#define ICMP_EXT_MAL_QUERY     1       /* Malformed Query */
+#define ICMP_EXT_NO_IF         2       /* No such Interface */
+#define ICMP_EXT_NO_TABLE_ENT  3       /* No such Table Entry */
+#define ICMP_EXT_MULT_IFS      4       /* Multiple Interfaces Satisfy Query */
+
+/* constants for EXT_ECHO (PROBE) */
+#define EXT_ECHOREPLY_ACTIVE   (1 << 2)/* position of active flag in reply */
+#define EXT_ECHOREPLY_IPV4     (1 << 1)/* position of ipv4 flag in reply */
+#define EXT_ECHOREPLY_IPV6     1       /* position of ipv6 flag in reply */
+#define EXT_ECHO_CTYPE_NAME    1
+#define EXT_ECHO_CTYPE_INDEX   2
+#define EXT_ECHO_CTYPE_ADDR    3
+#define EXT_ECHO_AFI_IP                1       /* Address Family Identifier for IPV4 */
+#define EXT_ECHO_AFI_IP6       2       /* Address Family Identifier for IPV6 */
 
 struct icmphdr {
   __u8         type;
@@ -118,4 +135,27 @@ struct icmp_extobj_hdr {
        __u8            class_type;
 };
 
+/* RFC 8335: 2.1 Header for C-type 3 payload */
+struct icmp_ext_echo_ctype3_hdr {

include/uapi/linux/icmp.h struct icmp_extobj_hdr { · line 149

Quoted 10 lines
include/uapi/linux/icmp.h +10 -0
+       __u16           afi;
+       __u8            addrlen;
+       __u8            reserved;
+};
+
+/* RFC 8335: Interface Identification Object */
+struct icmp_ext_echo_iio {
+       struct icmp_extobj_hdr  extobj_hdr;
+       union {
+               __u32   ifIndex;

please no camelcase.

include/uapi/linux/icmp.h struct icmp_extobj_hdr { · line 150

Quoted 1 line
include/uapi/linux/icmp.h +1 -0
+               char name;

why single char?

include/uapi/linux/icmp.h struct icmp_extobj_hdr { · line 154

Quoted 4 lines
include/uapi/linux/icmp.h +4 -0
+               struct {
+                       struct icmp_ext_echo_ctype3_hdr ctype3_hdr;
+                       union {
+                               __be32          ipv4_addr;

perhaps struct in_addr

Quoted 10 lines
include/uapi/linux/icmp.h +6 -1
+                               struct in6_addr ipv6_addr;
+                       } ip_addr;
+               } addr;
+       } ident;
+};
+
 #endif /* _UAPI_LINUX_ICMP_H */
--

2.25.1

#7 lore raw

Re: [PATCH V3 net-next 5/5] icmp: add response to RFC 8335 PROBE messages

In reply to Andreas Roeseler
Quoted 58 lines · Andreas Roeseler

Modify the icmp_rcv function to check for PROBE messages and call icmp_echo if a PROBE request is detected.

Modify the existing icmp_echo function to respond to both ping and PROBE requests.

This was tested using a custom modification of the iputils package and wireshark. It supports IPV4 probing by name, ifindex, and probing by both IPV4 and IPV6 addresses. It currently does not support responding to probes off the proxy node (See RFC 8335 Section 2).

---
Changes since v1:
- Reorder variable declarations to follow coding style
- Switch to functions such as dev_get_by_name and ip_dev_find to lookup net devices

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add verification of incoming messages before looking up netdev

- Include net/addrconf.h library for ipv6_dev_find

---
 net/ipv4/icmp.c | 133 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 122 insertions(+), 11 deletions(-)
net/ipv4/icmp.c +4 -1
index 396b492c804f..3caca9f2aa07 100644
@@ -92,6 +92,7 @@
 #include <net/inet_common.h>
 #include <net/ip_fib.h>
 #include <net/l3mdev.h>
+#include <net/addrconf.h>
 
 /*
  *     Build xmit assembly blocks
@@ -970,7 +971,7 @@ static bool icmp_redirect(struct sk_buff *skb)
 }
 
 /*
- *     Handle ICMP_ECHO ("ping") requests.
+ *     Handle ICMP_ECHO ("ping") and ICMP_EXT_ECHO ("PROBE") requests.
  *
  *     RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
  *               requests.
@@ -978,26 +979,122 @@ static bool icmp_redirect(struct sk_buff *skb)
  *               included in the reply.
  *     RFC 1812: 4.3.3.6 SHOULD have a config option for silently ignoring
  *               echo requests, MUST have default=NOT.
+ *     RFC 8335: 8 MUST have a config option to enable/disable ICMP
+ *               Extended Echo functionality, MUST be disabled by default
  *     See also WRT handling of options once they are done and working.
  */

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 995

Quoted 10 lines
net/ipv4/icmp.c +6 -0
 
 static bool icmp_echo(struct sk_buff *skb)
 {
+       struct icmp_ext_echo_iio *iio;
+       struct icmp_ext_hdr *ext_hdr;
+       struct icmp_bxm icmp_param;
+       struct net_device *dev;
        struct net *net;
+       __u16 ident_len;
+       __u8 status;

no need for underscore variants.

Quoted 28 lines
net/ipv4/icmp.c +14 -9
+       char *buff;
 
        net = dev_net(skb_dst(skb)->dev);
-       if (!net->ipv4.sysctl_icmp_echo_ignore_all) {
-               struct icmp_bxm icmp_param;
+       /* should there be an ICMP stat for ignored echos? */
+       if (net->ipv4.sysctl_icmp_echo_ignore_all)
+               return true;
 
-               icmp_param.data.icmph      = *icmp_hdr(skb);
+       icmp_param.data.icmph           = *icmp_hdr(skb);
+       icmp_param.skb                  = skb;
+       icmp_param.offset               = 0;
+       icmp_param.data_len             = skb->len;
+       icmp_param.head_len             = sizeof(struct icmphdr);
+       if (icmp_param.data.icmph.type == ICMP_ECHO) {
                icmp_param.data.icmph.type = ICMP_ECHOREPLY;
-               icmp_param.skb             = skb;
-               icmp_param.offset          = 0;
-               icmp_param.data_len        = skb->len;
-               icmp_param.head_len        = sizeof(struct icmphdr);
-               icmp_reply(&icmp_param, skb);
+               goto send_reply;
        }
-       /* should there be an ICMP stat for ignored echos? */
+       if (!net->ipv4.sysctl_icmp_echo_enable_probe)
+               return true;
+       /* We currently only support probing interfaces on the proxy node

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1024

Quoted 10 lines
net/ipv4/icmp.c +10 -0
+        * Check to ensure L-bit is set
+        */
+       if (!(ntohs(icmp_param.data.icmph.un.echo.sequence) & 1))
+               return true;
+
+       /* Clear status bits in reply message */
+       icmp_param.data.icmph.un.echo.sequence &= htons(0xFF00);
+       icmp_param.data.icmph.type = ICMP_EXT_ECHOREPLY;
+       ext_hdr = (struct icmp_ext_hdr *)(icmp_hdr(skb) + 1);
+       iio = (struct icmp_ext_echo_iio *)(ext_hdr + 1);

Check that these fields exist (skb is not truncated). skb_header_pointer is the safest approach.

For this and following point, see also ip_icmp_error_rfc4884_validate.

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1025

Quoted 1 line
net/ipv4/icmp.c +1 -0
+       ident_len = ntohs(iio->extobj_hdr.length) - sizeof(iio->extobj_hdr);

Negative overflow: cannot trust that extobj_hdr.length >= sizeof(iio->extobj_hdr)

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1030

Quoted 5 lines
net/ipv4/icmp.c +5 -0
+       status = 0;
+       dev = NULL;
+       switch (iio->extobj_hdr.class_type) {
+       case EXT_ECHO_CTYPE_NAME:
+               if (ident_len >= skb->len - sizeof(struct icmphdr) - sizeof(iio->extobj_hdr)) {

Also should check "If the Object Payload would not otherwise terminate on a 32-bit boundary, it MUST be padded with ASCII NULL characters."

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1034

Quoted 4 lines
net/ipv4/icmp.c +4 -0
+                       icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                       goto send_reply;
+               }
+               buff = kcalloc(ident_len + 1, sizeof(char), GFP_KERNEL);

Can statically allocate on stack using IFNAMSIZ. Any ident_len > that is wrong, anyway.

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1042

Quoted 8 lines
net/ipv4/icmp.c +8 -0
+               if (!buff)
+                       return -ENOMEM;
+               memcpy(buff, &iio->ident.name, ident_len);
+               dev = dev_get_by_name(net, buff);
+               kfree(buff);
+               break;
+       case EXT_ECHO_CTYPE_INDEX:
+               if (ident_len != sizeof(iio->ident.ifIndex)) {

this checks that length is 4B, but RFC says "If the Interface Identification Object identifies the probed interface by index, the length is equal to 8 and the payload contains the if-index"

Quoted 12 lines
net/ipv4/icmp.c +12 -0
+                       icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                       goto send_reply;
+               }
+               dev = dev_get_by_index(net, ntohl(iio->ident.ifIndex));
+               break;
+       case EXT_ECHO_CTYPE_ADDR:
+               switch (ntohs(iio->ident.addr.ctype3_hdr.afi)) {
+               case EXT_ECHO_AFI_IP:
+                       if (ident_len != sizeof(iio->ident.addr.ctype3_hdr) + sizeof(__be32) ||
+                           ident_len != sizeof(iio->ident.addr.ctype3_hdr) + iio->ident.addr.ctype3_hdr.addrlen) {
+                               icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                               goto send_reply;

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1064

Quoted 10 lines
net/ipv4/icmp.c +10 -0
+                       }
+                       dev = ip_dev_find(net, iio->ident.addr.ip_addr.ipv4_addr);
+                       break;
+               case EXT_ECHO_AFI_IP6:
+                       if (ident_len != sizeof(iio->ident.addr.ctype3_hdr) + sizeof(struct in6_addr) ||
+                           ident_len != sizeof(iio->ident.addr.ctype3_hdr) + iio->ident.addr.ctype3_hdr.addrlen) {
+                               icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                               goto send_reply;
+                       }
+                       dev = ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev);

From function comment: "The caller should be protected by RCU, or RTNL.". Is that the case here?

Also dependent on CONFIG_IPV6

Quoted 15 lines
net/ipv4/icmp.c +15 -0
+                       if (dev)
+                               dev_hold(dev);
+                       break;
+               default:
+                       icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                       goto send_reply;
+               }
+               break;
+       default:
+               icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+               goto send_reply;
+       }
+       if (!dev) {
+               icmp_param.data.icmph.code = ICMP_EXT_NO_IF;
+               goto send_reply;

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1089

Quoted 10 lines
net/ipv4/icmp.c +10 -0
+       }
+       /* RFC 8335: 3 the last 8 bits of the Extended Echo Reply Message
+        *  are laid out as follows:
+        *      +-+-+-+-+-+-+-+-+
+        *      |State|Res|A|4|6|
+        *      +-+-+-+-+-+-+-+-+
+        */
+       if (dev->flags & IFF_UP)
+               status |= EXT_ECHOREPLY_ACTIVE;
+       if (dev->ip_ptr->ifa_list)

This is an __rcu pointer, requires rcu_dereference, e.g., via __in_dev_get_rcu

Quoted 42 lines
net/ipv4/icmp.c +16 -1
+               status |= EXT_ECHOREPLY_IPV4;
+       if (!list_empty(&dev->ip6_ptr->addr_list))
+               status |= EXT_ECHOREPLY_IPV6;
+       dev_put(dev);
+       icmp_param.data.icmph.un.echo.sequence |= htons(status);
+
+send_reply:
+       icmp_reply(&icmp_param, skb);
        return true;
 }
 
@@ -1087,6 +1184,13 @@ int icmp_rcv(struct sk_buff *skb)
        icmph = icmp_hdr(skb);
 
        ICMPMSGIN_INC_STATS(net, icmph->type);
+
+       /*
+        *      Check for ICMP Extended Echo (PROBE) messages
+        */
+       if (icmph->type == ICMP_EXT_ECHO || icmph->type == ICMPV6_EXT_ECHO_REQUEST)
+               goto probe;
+
        /*
         *      18 is the highest 'known' ICMP type. Anything else is a mystery
         *
@@ -1096,7 +1200,6 @@ int icmp_rcv(struct sk_buff *skb)
        if (icmph->type > NR_ICMP_TYPES)
                goto error;
 
-
        /*
         *      Parse the ICMP message
         */
@@ -1123,6 +1226,7 @@ int icmp_rcv(struct sk_buff *skb)
 
        success = icmp_pointers[icmph->type].handler(skb);
 
+success_check:
        if (success)  {
                consume_skb(skb);
                return NET_RX_SUCCESS;

net/ipv4/icmp.c int icmp_rcv(struct sk_buff *skb) · line 1247

Quoted 8 lines
net/ipv4/icmp.c +5 -0
@@ -1136,6 +1240,13 @@ int icmp_rcv(struct sk_buff *skb)
 error:
        __ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
        goto drop;
+probe:
+       /*
+        * We can't use icmp_pointers[].handler() because the codes for PROBE
+        *   messages are 42 or 160
+        */

ICMPv6 message 160 (ICMPV6_EXT_ECHO_REQUEST) must be handled in icmpv6_rcv, not icmp_rcv. Then the ICMPv4 message 42 can be handled in the usual way.

Quoted 8 lines
net/ipv4/icmp.c +2 -1
+       success = icmp_echo(skb);
+       goto success_check;
 }
 
 static bool ip_icmp_error_rfc4884_validate(const struct sk_buff *skb, int off)
--

2.25.1

#8 lore raw

Re: [PATCH V3 net-next 5/5] icmp: add response to RFC 8335 PROBE messages

On Sun, 2021-02-21 at 23:49 -0500, Willem de Bruijn wrote:

Quoted 70 lines · Andreas Roeseler

Modify the icmp_rcv function to check for PROBE messages and call icmp_echo if a PROBE request is detected.

Modify the existing icmp_echo function to respond to both ping and PROBE
requests.

This was tested using a custom modification of the iputils package and
wireshark. It supports IPV4 probing by name, ifindex, and probing by both IPV4 and IPV6
addresses. It currently does not support responding to probes off the proxy node
(See RFC 8335 Section 2).

---
Changes since v1:
 - Reorder variable declarations to follow coding style
 - Switch to functions such as dev_get_by_name and ip_dev_find to lookup
   net devices

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
 - Add verification of incoming messages before looking up netdev

 - Include net/addrconf.h library for ipv6_dev_find
---
 net/ipv4/icmp.c | 133 ++++++++++++++++++++++++++++++++++++++++++++-- --

 1 file changed, 122 insertions(+), 11 deletions(-)
net/ipv4/icmp.c +2 -1
index 396b492c804f..3caca9f2aa07 100644
@@ -92,6 +92,7 @@
  #include <net/inet_common.h>
  #include <net/ip_fib.h>
  #include <net/l3mdev.h>
+#include <net/addrconf.h>
 
  /*
   *     Build xmit assembly blocks
@@ -970,7 +971,7 @@ static bool icmp_redirect(struct sk_buff *skb)
  }
 
  /*
- *     Handle ICMP_ECHO ("ping") requests.
+ *     Handle ICMP_ECHO ("ping") and ICMP_EXT_ECHO ("PROBE")

requests.
  *
  *     RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
  *               requests.

net/ipv4/icmp.c +0 -0
@@ -978,26 +979,122 @@ static bool icmp_redirect(struct sk_buff *skb)
   *               included in the reply.
   *     RFC 1812: 4.3.3.6 SHOULD have a config option for silently

ignoring
  *               echo requests, MUST have default=NOT.
+ *     RFC 8335: 8 MUST have a config option to enable/disable ICMP
+ *               Extended Echo functionality, MUST be disabled by default
  *     See also WRT handling of options once they are done and working.
  */

Quoted 9 lines

 static bool icmp_echo(struct sk_buff *skb)
 {
+       struct icmp_ext_echo_iio *iio;
+       struct icmp_ext_hdr *ext_hdr;
+       struct icmp_bxm icmp_param;
+       struct net_device *dev;
        struct net *net;
+       __u16 ident_len;
+       __u8 status;

no need for underscore variants.

Quoted 31 lines

+       char *buff;

        net = dev_net(skb_dst(skb)->dev);
-       if (!net->ipv4.sysctl_icmp_echo_ignore_all) { -               struct icmp_bxm icmp_param;
+       /* should there be an ICMP stat for ignored echos? */ +       if (net->ipv4.sysctl_icmp_echo_ignore_all) +               return true;

-               icmp_param.data.icmph      = *icmp_hdr(skb); +       icmp_param.data.icmph           = *icmp_hdr(skb); +       icmp_param.skb                  = skb;
+       icmp_param.offset               = 0;
+       icmp_param.data_len             = skb->len;
+       icmp_param.head_len             = sizeof(struct icmphdr); +       if (icmp_param.data.icmph.type == ICMP_ECHO) { icmp_param.data.icmph.type = ICMP_ECHOREPLY; -               icmp_param.skb             = skb;
-               icmp_param.offset          = 0;
-               icmp_param.data_len        = skb->len;
-               icmp_param.head_len        = sizeof(struct icmphdr); -               icmp_reply(&icmp_param, skb);
+               goto send_reply;
        }
-       /* should there be an ICMP stat for ignored echos? */ +       if (!net->ipv4.sysctl_icmp_echo_enable_probe)
+               return true;
+       /* We currently only support probing interfaces on the proxy node
+        * Check to ensure L-bit is set
+        */

Quoted 8 lines

+       if (!(ntohs(icmp_param.data.icmph.un.echo.sequence) & 1)) +               return true;
+
+       /* Clear status bits in reply message */
+       icmp_param.data.icmph.un.echo.sequence &= htons(0xFF00); +       icmp_param.data.icmph.type = ICMP_EXT_ECHOREPLY; +       ext_hdr = (struct icmp_ext_hdr *)(icmp_hdr(skb) + 1); +       iio = (struct icmp_ext_echo_iio *)(ext_hdr + 1);

Check that these fields exist (skb is not truncated). skb_header_pointer is the safest approach.

For this and following point, see also ip_icmp_error_rfc4884_validate.

Quoted 2 lines

+       ident_len = ntohs(iio->extobj_hdr.length) - sizeof(iio-

Quoted 1 line

extobj_hdr);

Negative overflow: cannot trust that extobj_hdr.length >= sizeof(iio->extobj_hdr)

Quoted 6 lines

+       status = 0;
+       dev = NULL;
+       switch (iio->extobj_hdr.class_type) {
+       case EXT_ECHO_CTYPE_NAME:
+               if (ident_len >= skb->len - sizeof(struct icmphdr) - sizeof(iio->extobj_hdr)) {

Also should check "If the Object Payload would not otherwise terminate on a 32-bit boundary, it MUST be padded with ASCII NULL characters."

Quoted 6 lines

+                       icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                       goto send_reply;
+               }
+               buff = kcalloc(ident_len + 1, sizeof(char), GFP_KERNEL);

Can statically allocate on stack using IFNAMSIZ. Any ident_len > that is wrong, anyway.

Quoted 8 lines

+               if (!buff)
+                       return -ENOMEM;
+               memcpy(buff, &iio->ident.name, ident_len); +               dev = dev_get_by_name(net, buff);
+               kfree(buff);
+               break;
+       case EXT_ECHO_CTYPE_INDEX:
+               if (ident_len != sizeof(iio->ident.ifIndex)) {

this checks that length is 4B, but RFC says "If the Interface Identification Object identifies the probed interface by index, the length is equal to 8 and the payload contains the if-index"

ident_len stores the value of the identifier of the interface only, i.e. it stores the length of the iio minus the length of the iio header. Therefore, we can check its size against the expected size of an if_Index (4 octets)

Quoted 23 lines

+                       icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                       goto send_reply;
+               }
+               dev = dev_get_by_index(net, ntohl(iio-

Quoted 1 line

ident.ifIndex));

+               break;
+       case EXT_ECHO_CTYPE_ADDR:
+               switch (ntohs(iio->ident.addr.ctype3_hdr.afi)) { +               case EXT_ECHO_AFI_IP:
+                       if (ident_len != sizeof(iio-

Quoted 1 line

ident.addr.ctype3_hdr) + sizeof(__be32) ||

+                           ident_len != sizeof(iio-

Quoted 1 line

ident.addr.ctype3_hdr) + iio->ident.addr.ctype3_hdr.addrlen) {

+                               icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                               goto send_reply;
+                       }
+                       dev = ip_dev_find(net, iio-

Quoted 1 line

ident.addr.ip_addr.ipv4_addr);

+                       break;
+               case EXT_ECHO_AFI_IP6:
+                       if (ident_len != sizeof(iio-

Quoted 9 lines
Quoted 1 line

ident.addr.ctype3_hdr) + sizeof(struct in6_addr) ||

+                           ident_len != sizeof(iio-

Quoted 1 line

ident.addr.ctype3_hdr) + iio->ident.addr.ctype3_hdr.addrlen) {

+                               icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                               goto send_reply;
+                       }
+                       dev = ipv6_dev_find(net, &iio-

Quoted 1 line

ident.addr.ip_addr.ipv6_addr, dev);

From function comment: "The caller should be protected by RCU, or RTNL.". Is that the case here?

Also dependent on CONFIG_IPV6

Quoted 19 lines

+                       if (dev)
+                               dev_hold(dev);
+                       break;
+               default:
+                       icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY;
+                       goto send_reply;
+               }
+               break;
+       default:
+               icmp_param.data.icmph.code = ICMP_EXT_MAL_QUERY; +               goto send_reply;
+       }
+       if (!dev) {
+               icmp_param.data.icmph.code = ICMP_EXT_NO_IF; +               goto send_reply;
+       }
+       /* RFC 8335: 3 the last 8 bits of the Extended Echo Reply Message

Quoted 8 lines

+        *  are laid out as follows:
+        *      +-+-+-+-+-+-+-+-+
+        *      |State|Res|A|4|6|
+        *      +-+-+-+-+-+-+-+-+
+        */
+       if (dev->flags & IFF_UP)
+               status |= EXT_ECHOREPLY_ACTIVE;
+       if (dev->ip_ptr->ifa_list)

This is an __rcu pointer, requires rcu_dereference, e.g., via __in_dev_get_rcu

Quoted 45 lines

+               status |= EXT_ECHOREPLY_IPV4;
+       if (!list_empty(&dev->ip6_ptr->addr_list))
+               status |= EXT_ECHOREPLY_IPV6;
+       dev_put(dev);
+       icmp_param.data.icmph.un.echo.sequence |= htons(status);

net/ipv4/icmp.c +3 -0
+
+send_reply:
+       icmp_reply(&icmp_param, skb);

        return true;
 }

net/ipv4/icmp.c +7 -0
@@ -1087,6 +1184,13 @@ int icmp_rcv(struct sk_buff *skb)
         icmph = icmp_hdr(skb);
 
         ICMPMSGIN_INC_STATS(net, icmph->type);
+
+       /*
+        *      Check for ICMP Extended Echo (PROBE) messages
+        */
+       if (icmph->type == ICMP_EXT_ECHO || icmph->type ==
 ICMPV6_EXT_ECHO_REQUEST)
+               goto probe;
+
         /*
          *      18 is the highest 'known' ICMP type. Anything else is

a mystery
         *

net/ipv4/icmp.c +1 -1
@@ -1096,7 +1200,6 @@ int icmp_rcv(struct sk_buff *skb)
         if (icmph->type > NR_ICMP_TYPES)
                 goto error;
 
-
         /*
          *      Parse the ICMP message
          */
@@ -1123,6 +1226,7 @@ int icmp_rcv(struct sk_buff *skb)
 
         success = icmp_pointers[icmph->type].handler(skb);
 
+success_check:
         if (success)  {
                 consume_skb(skb);
                 return NET_RX_SUCCESS;
@@ -1136,6 +1240,13 @@ int icmp_rcv(struct sk_buff *skb)

 error:

Quoted 8 lines

        __ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
        goto drop;
+probe:
+       /*
+        * We can't use icmp_pointers[].handler() because the codes for PROBE
+        *   messages are 42 or 160
+        */

ICMPv6 message 160 (ICMPV6_EXT_ECHO_REQUEST) must be handled in icmpv6_rcv, not icmp_rcv. Then the ICMPv4 message 42 can be handled in the usual way.

You are correct that we should handle ICMPV6_EXT_ECHO_REQUEST in the icmpv6.c file, but shouldn't we still have a special handler for the ICMPv4 message? The current icmp_pointers[].handler is an array of size NR_ICMP_TYPES + 1 (or 19 elements), so I don't think it would be a good idea to extend it to 42.

Quoted 9 lines

+       success = icmp_echo(skb);
+       goto success_check;
 }

 static bool ip_icmp_error_rfc4884_validate(const struct sk_buff *skb, int off)
--
2.25.1

#9 lore raw

Re: [PATCH V3 net-next 5/5] icmp: add response to RFC 8335 PROBE messages

Quoted 45 lines · Andreas Roeseler

On Sun, 2021-02-21 at 23:49 -0500, Willem de Bruijn wrote:

Quoted 32 lines · Andreas Roeseler

Modify the icmp_rcv function to check for PROBE messages and call icmp_echo if a PROBE request is detected.

Modify the existing icmp_echo function to respond to both ping and PROBE
requests.

This was tested using a custom modification of the iputils package and
wireshark. It supports IPV4 probing by name, ifindex, and probing by both IPV4 and IPV6
addresses. It currently does not support responding to probes off the proxy node
(See RFC 8335 Section 2).

---
Changes since v1:
- Reorder variable declarations to follow coding style
- Switch to functions such as dev_get_by_name and ip_dev_find to
lookup
net devices

Changes since v2:
Suggested by Willem de Brujin <[email protected]>
- Add verification of incoming messages before looking up netdev

- Include net/addrconf.h library for ipv6_dev_find

net/ipv4/icmp.c static bool icmp_redirect(struct sk_buff *skb) · line 1042

Quoted 8 lines
net/ipv4/icmp.c +8 -0
+               if (!buff)
+                       return -ENOMEM;
+               memcpy(buff, &iio->ident.name, ident_len);
+               dev = dev_get_by_name(net, buff);
+               kfree(buff);
+               break;
+       case EXT_ECHO_CTYPE_INDEX:
+               if (ident_len != sizeof(iio->ident.ifIndex)) {
Quoted 8 lines

this checks that length is 4B, but RFC says "If the Interface Identification Object identifies the probed interface by index, the length is equal to 8 and the payload contains the if-index"

ident_len stores the value of the identifier of the interface only, i.e. it stores the length of the iio minus the length of the iio header. Therefore, we can check its size against the expected size of an if_Index (4 octets)

Great. Thanks for clarifying.

Quoted 32 lines
Quoted 24 lines
net/ipv4/icmp.c +4 -1
@@ -1096,7 +1200,6 @@ int icmp_rcv(struct sk_buff *skb)
        if (icmph->type > NR_ICMP_TYPES)
                goto error;
 
-
        /*
         *      Parse the ICMP message
         */
@@ -1123,6 +1226,7 @@ int icmp_rcv(struct sk_buff *skb)
 
        success = icmp_pointers[icmph->type].handler(skb);
 
+success_check:
        if (success)  {
                consume_skb(skb);
                return NET_RX_SUCCESS;
@@ -1136,6 +1240,13 @@ int icmp_rcv(struct sk_buff *skb)
 error:
        __ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
        goto drop;
+probe:
+       /*
+        * We can't use icmp_pointers[].handler() because the codes

for PROBE

net/ipv4/icmp.c int icmp_rcv(struct sk_buff *skb) · line 1247

Quoted 2 lines
net/ipv4/icmp.c +2 -0
+        *   messages are 42 or 160
+        */

ICMPv6 message 160 (ICMPV6_EXT_ECHO_REQUEST) must be handled in icmpv6_rcv, not icmp_rcv. Then the ICMPv4 message 42 can be handled in the usual way.

Quoted 5 lines

You are correct that we should handle ICMPV6_EXT_ECHO_REQUEST in the icmpv6.c file, but shouldn't we still have a special handler for the ICMPv4 message? The current icmp_pointers[].handler is an array of size NR_ICMP_TYPES + 1 (or 19 elements), so I don't think it would be a good idea to extend it to 42.

Interesting. So almost all numbers between NR_ICMP_TYPES (18) and 42 are deprecated:

https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml

Eventually we might get more extensions after 42. So you can go either way. The table is the clean approach. But I see the practical point of extending it for one case, too. The current branch approach looks fine to me.