psp: strip variable-length PSP header in psp_dev_rcv()

psp_dev_rcv() unconditionally removes a fixed PSP_ENCAP_HLEN, even
when psph->hdrlen indicates that the PSP header carries optional
fields. A frame whose PSP header advertises a non-zero VC or any
extension would therefore be silently mis-decapsulated: option bytes
would spill into the inner packet head and downstream parsing would
fail on a corrupted skb.

Compute the full PSP header length from psph->hdrlen, pull the
optional bytes into the linear region, and strip the whole header
when decapsulating. Optional fields (VC, ...) are still ignored,
just discarded with the rest of the header instead of leaking.
crypt_offset and the VIRT flag are intentionally not validated here
- callers know their device's PSP implementation and can decide.

Both in-tree callers gate on hardware-validated PSP, so this is a
correctness fix rather than a reachable corruption path under
current configurations.

Fixes: 0eddb8023cee ("psp: provide decapsulation and receive helper for drivers")
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Daniel Zahka <daniel.zahka@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: David Carlier <devnexen@gmail.com>
Link: https://patch.msgid.link/20260502141945.14484-1-devnexen@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c
index 9508b6c380038b311a9b778933789b5c4cb61007..e45549f08eef8a7d50028fc31143c917724783ea 100644 (file)
--- a/net/psp/psp_main.c
+++ b/net/psp/psp_main.c
@@ -263,15 +263,16 @@ EXPORT_SYMBOL(psp_dev_encapsulate);
 
 /* Receive handler for PSP packets.
  *
- * Presently it accepts only already-authenticated packets and does not
- * support optional fields, such as virtualization cookies. The caller should
- * ensure that skb->data is pointing to the mac header, and that skb->mac_len
- * is set. This function does not currently adjust skb->csum (CHECKSUM_COMPLETE
- * is not supported).
+ * Accepts only already-authenticated packets. The full PSP header is
+ * stripped according to psph->hdrlen; any optional fields it advertises
+ * (virtualization cookies, etc.) are ignored and discarded along with the
+ * rest of the header. The caller should ensure that skb->data is pointing
+ * to the mac header, and that skb->mac_len is set. This function does not
+ * currently adjust skb->csum (CHECKSUM_COMPLETE is not supported).
  */
 int psp_dev_rcv(struct sk_buff *skb, u16 dev_id, u8 generation, bool strip_icv)
 {
-       int l2_hlen = 0, l3_hlen, encap;
+       int l2_hlen = 0, l3_hlen, encap, psp_hlen;
        struct psp_skb_ext *pse;
        struct psphdr *psph;
        struct ethhdr *eth;
@@ -312,18 +313,36 @@ int psp_dev_rcv(struct sk_buff *skb, u16 dev_id, u8 generation, bool strip_icv)
        if (unlikely(uh->dest != htons(PSP_DEFAULT_UDP_PORT)))
                return -EINVAL;
 
-       pse = skb_ext_add(skb, SKB_EXT_PSP);
-       if (!pse)
+       psph = (struct psphdr *)(skb->data + l2_hlen + l3_hlen +
+                                sizeof(struct udphdr));
+
+       /* Strip the full PSP header per psph->hdrlen; VC/options are pulled
+        * into the linear region only so they can be discarded with the
+        * rest of the header.
+        */
+       psp_hlen = (psph->hdrlen + 1) * 8;
+
+       if (unlikely(psp_hlen < sizeof(struct psphdr)))
+               return -EINVAL;
+
+       if (psp_hlen > sizeof(struct psphdr) &&
+           !pskb_may_pull(skb, l2_hlen + l3_hlen +
+                               sizeof(struct udphdr) + psp_hlen))
                return -EINVAL;
 
        psph = (struct psphdr *)(skb->data + l2_hlen + l3_hlen +
                                 sizeof(struct udphdr));
+
+       pse = skb_ext_add(skb, SKB_EXT_PSP);
+       if (!pse)
+               return -EINVAL;
+
        pse->spi = psph->spi;
        pse->dev_id = dev_id;
        pse->generation = generation;
        pse->version = FIELD_GET(PSPHDR_VERFL_VERSION, psph->verfl);
 
-       encap = PSP_ENCAP_HLEN;
+       encap = sizeof(struct udphdr) + psp_hlen;
        encap += strip_icv ? PSP_TRL_SIZE : 0;
 
        if (proto == htons(ETH_P_IP)) {
@@ -340,8 +359,9 @@ int psp_dev_rcv(struct sk_buff *skb, u16 dev_id, u8 generation, bool strip_icv)
                ipv6h->payload_len = htons(ntohs(ipv6h->payload_len) - encap);
        }
 
-       memmove(skb->data + PSP_ENCAP_HLEN, skb->data, l2_hlen + l3_hlen);
-       skb_pull(skb, PSP_ENCAP_HLEN);
+       memmove(skb->data + sizeof(struct udphdr) + psp_hlen,
+               skb->data, l2_hlen + l3_hlen);
+       skb_pull(skb, sizeof(struct udphdr) + psp_hlen);
 
        if (strip_icv)
                pskb_trim(skb, skb->len - PSP_TRL_SIZE);