Skip to contentSkip to conversation

ipvs: csum validations, part 2

PATCH Superseded Julian Anastasov 1 participant 4 messages Jul 28

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Julian Anastasov

author maintainer
#0 lore raw

v2 cover ipvs: csum validations, part 2

Hello,

This patchset contains more fixes after the
previous batch of fixes for checksum validations.

The first patch avoids reading the IPv4 ihl field
multiple times to prevent local attacker to cause out-of-bounds write in ip_vs_nat_icmp.

The second patch returns the checksum validations
which can be needed for the FORWARD hook.

Julian Anastasov (2):
ipvs: avoid out-of-bounds write in ip_vs_nat_icmp
ipvs: return the csum validation for forward hook

 include/net/ip_vs.h                   | 32 +--------
 net/netfilter/ipvs/ip_vs_core.c       | 94 +++++++++++++++++----------
 net/netfilter/ipvs/ip_vs_proto_sctp.c |  2 +-
 net/netfilter/ipvs/ip_vs_xmit.c       |  2 +-
 4 files changed, 66 insertions(+), 64 deletions(-)
Signature · 1 line
2.55.0
author maintainer
#1 lore raw

PATCH v2 1/2 ipvs: avoid out-of-bounds write in ip_vs_nat_icmp

Sashiko warns that local attacker can modify the packet while it is processed by IPVS. Some places read the IP ihl field multiple times which can cause out-of-bounds access. One such place is ip_vs_nat_icmp where we can write after the validated area.

Fix it by providing ciph argument just like it is done for IPv6 and use ciph->len as offset to the embedded transport header.

Modify some IPv4 header checks by reading the ihl field only once.

---
 include/net/ip_vs.h             |  2 +-
 net/netfilter/ipvs/ip_vs_core.c | 67 +++++++++++++++++----------------
 net/netfilter/ipvs/ip_vs_xmit.c |  2 +-
 3 files changed, 36 insertions(+), 35 deletions(-)
include/net/ip_vs.h +1 -1
index e6ca930a3507..1235f1934e94 100644
@@ -2062,7 +2062,7 @@ static inline bool ip_vs_conn_use_hash2(struct ip_vs_conn *cp)
 
 void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,
 		    struct ip_vs_conn *cp, int dir, unsigned int toff,
-		    bool has_ports);
+		    bool has_ports, struct ip_vs_iphdr *ciph);
 
 #ifdef CONFIG_IP_VS_IPV6
 void ip_vs_nat_icmp_v6(struct sk_buff *skb, struct ip_vs_protocol *pp,
net/netfilter/ipvs/ip_vs_core.c +34 -33

180 lines not on this page · raw message

net/netfilter/ipvs/ip_vs_xmit.c +1 -1
index cdc567ceabf4..4469dcc4bb1e 100644
@@ -1582,7 +1582,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
 	if (skb_cow(skb, rt->dst.dev->hard_header_len))
 		goto tx_error;
 
-	ip_vs_nat_icmp(skb, pp, cp, 0, toff, has_ports);
+	ip_vs_nat_icmp(skb, pp, cp, 0, toff, has_ports, ciph);
 
 	/* Another hack: avoid icmp_send in ip_fragment */
 	skb->ignore_df = 1;
Signature · 1 line
2.55.0
author maintainer
#2 lore raw

PATCH v2 2/2 ipvs: return the csum validation for forward hook

In reply to Julian Anastasov

Sashiko notes that playing games with the skb dst and rt flags instead of providing hooknum is not a good idea when validating the checksums.

Also, skipping checksum validation for FORWARD packets risk silent data corruption, even if the only user is the FTP-CMD packets coming from the real server.

Sashiko also noticed that by using common checksum helper in the previous commit we actually fixed old bug where the TCP/UDP checksum for IPv6 on CHECKSUM_COMPLETE was not validated correctly.

---
 include/net/ip_vs.h                   | 30 ++-------------------------
 net/netfilter/ipvs/ip_vs_core.c       | 27 ++++++++++++++++++++++++
 net/netfilter/ipvs/ip_vs_proto_sctp.c |  2 +-
 3 files changed, 30 insertions(+), 29 deletions(-)
include/net/ip_vs.h +2 -28
index 1235f1934e94..10f5ce76a0ae 100644
@@ -25,9 +25,7 @@
 #include <linux/netfilter.h>		/* for union nf_inet_addr */
 #include <linux/ip.h>
 #include <linux/ipv6.h>			/* for struct ipv6hdr */
-#include <net/route.h>
 #include <net/ipv6.h>
-#include <net/ip6_fib.h>
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
 #include <net/netfilter/nf_conntrack.h>
 #endif
@@ -2095,32 +2093,8 @@ static inline __wsum ip_vs_check_diff2(__be16 old, __be16 new, __wsum oldsum)
 	return csum_partial(diff, sizeof(diff), oldsum);
 }
 
-static inline bool ip_vs_checksum_needed(struct sk_buff *skb, int af)
-{
-	/* Checksum unnecessary or already validated? */
-	if (skb_csum_unnecessary(skb))
-		return false;
-	/* LOCAL_OUT ? */
-	if (!skb->dev || skb->dev->flags & IFF_LOOPBACK)
-		return false;
-	/* !LOCAL_IN (FORWARD) ? */
-	if (af == AF_INET6) {
-		if (!(dst_rt6_info(skb_dst(skb))->rt6i_flags & RTF_LOCAL))
-			return false;
-	} else {
-		if (!(skb_rtable(skb)->rt_flags & RTCF_LOCAL))
-			return false;
-	}
-	return true;
-}
-
-static inline bool ip_vs_checksum_common_check(struct sk_buff *skb,
-					       int offset, int proto, int af)
-{
-	if (!ip_vs_checksum_needed(skb, af))
-		return true;
-	return !nf_checksum(skb, NF_INET_LOCAL_IN, offset, proto, af);
-}
+bool ip_vs_checksum_common_check(struct sk_buff *skb, int offset, int proto,
+				 int af);
 
 /* Forget current conntrack (unconfirmed) and attach notrack entry */
 static inline void ip_vs_notrack(struct sk_buff *skb)
net/netfilter/ipvs/ip_vs_core.c +27 -0
index 0bdaeb4ed61e..a51418a449cc 100644
@@ -872,6 +872,33 @@ static __sum16 ip_vs_checksum_complete(struct sk_buff *skb, int offset)
 	return csum_fold(skb_checksum(skb, offset, skb->len - offset, 0));
 }
 
+bool ip_vs_checksum_common_check(struct sk_buff *skb, int offset, int proto,
+				 int af)
+{
+	__wsum csum;
+
+	if (skb_csum_unnecessary(skb))
+		return true;
+	if (skb->ip_summed == CHECKSUM_NONE)
+		csum = skb_checksum(skb, offset, skb->len - offset, 0);
+	else if (skb->ip_summed == CHECKSUM_COMPLETE)
+		csum = csum_sub(skb->csum, skb_checksum(skb, 0, offset, 0));
+	else
+		return true;
+
+#ifdef CONFIG_IP_VS_IPV6
+	if (af == AF_INET6)
+		return !csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+					&ipv6_hdr(skb)->daddr,
+					skb->len - offset,
+					proto, csum);
+#endif
+	if (proto == IPPROTO_ICMP)
+		return !csum_fold(csum);
+	return !csum_tcpudp_magic(ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+				  skb->len - offset, proto, csum);
+}
+
 static inline enum ip_defrag_users ip_vs_defrag_user(unsigned int hooknum)
 {
 	if (NF_INET_LOCAL_IN == hooknum)
net/netfilter/ipvs/ip_vs_proto_sctp.c +1 -1
index 3dbd3096e163..dd54a37dee29 100644
@@ -193,7 +193,7 @@ sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
 	struct sctphdr *sh;
 	__le32 cmp, val;
 
-	if (!ip_vs_checksum_needed(skb, af))
+	if (skb_csum_unnecessary(skb))
 		return 1;
 	sh = (struct sctphdr *)(skb->data + sctphoff);
 	cmp = sh->checksum;
Signature · 1 line
2.55.0
author maintainer
#3 lore raw
In reply to Julian Anastasov

Hello,

Quoted 7 lines · Julian Anastasov

This patchset contains more fixes after the
previous batch of fixes for checksum validations.

The first patch avoids reading the IPv4 ihl field
multiple times to prevent local attacker to cause out-of-bounds write in ip_vs_nat_icmp.

Quoted 6 lines

The second patch returns the checksum validations
which can be needed for the FORWARD hook.

Julian Anastasov (2):
ipvs: avoid out-of-bounds write in ip_vs_nat_icmp
ipvs: return the csum validation for forward hook

There is something more to fix, will send v3:

https://sashiko.dev/#/patchset/20260728202520.59179-1-ja%40ssi.bg

pw-bot: changes-requested

Regards

--
Julian Anastasov <[email protected]>