Skip to contentSkip to conversation

net: geneve: gate GRO completion hints on socket config

PATCH In review Kyle Zeng 2 participants 3 messages Jun 7 – Jun 8

Subsystems (2)
lore
Share & tools
lore

Kyle Zeng

author
#0 lore raw

PATCH 1/1 net: geneve: gate GRO completion hints on socket config

Geneve GRO receive only consumes the netdev GRO hint option when the receiving Geneve socket has gro_hint enabled. geneve_gro_complete(), however, parses the hint option directly with geneve_opt_gro_hint_off() and therefore extends the completion offset even for sockets that did not enable hint processing.

That lets a packet for a normal Geneve socket carry a syntactically valid hint with an attacker-controlled nested_hdr_len. GRO receive validates and pulls only the ordinary Geneve header/options, but completion can then run the inner protocol completion callback at nhoff + gh_len where gh_len includes the untrusted hint length. This can make completion access beyond the header area validated by receive.

Use geneve_sk_gro_hint_off() in the completion path, matching receive and post-decap processing, so the hint is honored only for sockets that enabled the feature.

Fixes fd0dd796576e ("geneve: use GRO hint option in the RX path")
---
 drivers/net/geneve.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/geneve.c +2 -2
index c6563367d382..d62cbee6c0fe 100644
@@ -948,13 +948,13 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb,
 	struct genevehdr *gh;
 	struct packet_offload *ptype;
 	__be16 type;
-	int gh_len;
+	unsigned int gh_len;
 	int err = -ENOSYS;
 
 	gh = (struct genevehdr *)(skb->data + nhoff);
 	gh_len = geneve_hlen(gh);
 	type = gh->proto_type;
-	geneve_opt_gro_hint_off(gh, &type, &gh_len);
+	geneve_sk_gro_hint_off(sk, gh, &type, &gh_len);
 
 	/* since skb->encapsulation is set, eth_gro_complete() sets the inner mac header */
 	if (likely(type == htons(ETH_P_TEB)))
Signature · 1 line
2.43.0
author
#1 lore raw

Hi,

We have a PoC that can trigger warning or KASAN report. Please DM if you need it to reproduce the issue.

Thanks
Kyle

Quoted 46 lines · Kyle Zeng

Geneve GRO receive only consumes the netdev GRO hint option when the receiving Geneve socket has gro_hint enabled. geneve_gro_complete(), however, parses the hint option directly with geneve_opt_gro_hint_off() and therefore extends the completion offset even for sockets that did not enable hint processing.

That lets a packet for a normal Geneve socket carry a syntactically valid hint with an attacker-controlled nested_hdr_len. GRO receive validates and pulls only the ordinary Geneve header/options, but completion can then run the inner protocol completion callback at nhoff + gh_len where gh_len includes the untrusted hint length. This can make completion access beyond the header area validated by receive.

Use geneve_sk_gro_hint_off() in the completion path, matching receive and post-decap processing, so the hint is honored only for sockets that enabled the feature.

Fixes fd0dd796576e ("geneve: use GRO hint option in the RX path")
---
 drivers/net/geneve.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/geneve.c +2 -3
index c6563367d382..d62cbee6c0fe 100644
@@ -948,13 +948,13 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb,
        struct genevehdr *gh;
        struct packet_offload *ptype;
        __be16 type;
-       int gh_len;
+       unsigned int gh_len;
        int err = -ENOSYS;
 
        gh = (struct genevehdr *)(skb->data + nhoff);
        gh_len = geneve_hlen(gh);
        type = gh->proto_type;
-       geneve_opt_gro_hint_off(gh, &type, &gh_len);
+       geneve_sk_gro_hint_off(sk, gh, &type, &gh_len);
 
        /* since skb->encapsulation is set, eth_gro_complete() sets the inner mac header */
        if (likely(type == htons(ETH_P_TEB)))
--

2.43.0

maintainer
#2 lore raw
In reply to Kyle Zeng
Quoted 30 lines · Kyle Zeng

Geneve GRO receive only consumes the netdev GRO hint option when the receiving Geneve socket has gro_hint enabled. geneve_gro_complete(), however, parses the hint option directly with geneve_opt_gro_hint_off() and therefore extends the completion offset even for sockets that did not enable hint processing.

That lets a packet for a normal Geneve socket carry a syntactically valid hint with an attacker-controlled nested_hdr_len. GRO receive validates and pulls only the ordinary Geneve header/options, but completion can then run the inner protocol completion callback at nhoff + gh_len where gh_len includes the untrusted hint length. This can make completion access beyond the header area validated by receive.

Use geneve_sk_gro_hint_off() in the completion path, matching receive and post-decap processing, so the hint is honored only for sockets that enabled the feature.

Fixes fd0dd796576e ("geneve: use GRO hint option in the RX path")
---
 drivers/net/geneve.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/geneve.c +0 -0
index c6563367d382..d62cbee6c0fe 100644
@@ -948,13 +948,13 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb,
 	struct genevehdr *gh;
 	struct packet_offload *ptype;

drivers/net/geneve.c static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb, · line 957

Quoted 10 lines
drivers/net/geneve.c +2 -2
 	__be16 type;
-	int gh_len;
+	unsigned int gh_len;
 	int err = -ENOSYS;
 
 	gh = (struct genevehdr *)(skb->data + nhoff);
 	gh_len = geneve_hlen(gh);
 	type = gh->proto_type;
-	geneve_opt_gro_hint_off(gh, &type, &gh_len);
+	geneve_sk_gro_hint_off(sk, gh, &type, &gh_len);

Sashiko noted that geneve_sk_gro_hint_off could race with geneve_quiesce() (and thus with geneve_unquiesce()): gro_complete could observe a different hint status WRT the gro_receive step.

I think you additionally need to validate the inner(most) network header offset as derived by geneve_sk_gro_hint_off() (i.e. gh_len + nhoff + eventual mac presence) vs the one computed by gro_receive (that is:
NAPI_GRO_CB(skb)->inner_network_offset), and ev. error out in case of mismatch.

/P