RDMA/rxe: Fix packet length checks
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix packet length checks
In rxe_net.c a received packet, from udp or loopback, is passed to rxe_rcv() in rxe_recv.c as a udp packet. I.e. skb->data is pointing at the udp header. But rxe_rcv() makes length checks to verify the packet is long enough to hold the roce headers as if it were a roce packet. I.e. skb->data pointing at the bth header. A runt packet would appear to have 8 more bytes than it actually does which may lead to incorrect behavior.
This patch calls skb_pull() to adjust the skb to point at the bth header before calling rxe_rcv() which fixes this error.
--- drivers/infiniband/sw/rxe/rxe_net.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/infiniband/sw/rxe/rxe_net.c +6 -0
@@ -159,6 +159,9 @@ static int rxe_udp_encap_recv(struct sock *sk, struct sk_buff *skb) pkt->mask =RXE_GRH_MASK ; pkt->paylen =be16_to_cpu (udph->len) -sizeof (*udph); +/* remove udp header */ +skb_pull (skb,sizeof (struct udphdr )); +rxe_rcv (skb);return 0 ;
@@ -401,6 +404,9 @@ static int rxe_loopback(struct sk_buff *skb, struct rxe_pkt_info *pkt)return -EIO ; } +/* remove udp header */ +skb_pull (skb,sizeof (struct udphdr )); +rxe_rcv (skb);return 0 ;
Signature · 1 line
2.37.2
Quoted 32 lines · Bob Pearson
In
rxe_net.ca received packet, from udp or loopback, is passed torxe_rcv()inrxe_recv.cas a udp packet. I.e.skb->datais pointing at the udp header. Butrxe_rcv()makes length checks to verify the packet is long enough to hold the roce headers as if it were a roce packet. I.e.skb->datapointing at the bth header. A runt packet would appear to have 8 more bytes than it actually does which may lead to incorrect behavior.This patch calls
skb_pull()to adjust the skb to point at the bth header before callingrxe_rcv()which fixes this error.Fixes 8700e3e7c485 ("Soft RoCE driver")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_net.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/infiniband/sw/rxe/rxe_net.c +3
-0@@ -159,6 +159,9 @@ static int rxe_udp_encap_recv(struct sock *sk, struct sk_buff *skb) pkt->mask =RXE_GRH_MASK ; pkt->paylen =be16_to_cpu (udph->len) -sizeof (*udph); +/* remove udp header */ +skb_pull (skb,sizeof (struct udphdr )); +rxe_rcv (skb);return 0 ;
drivers/infiniband/sw/rxe/rxe_net.c static int rxe_loopback(struct sk_buff *skb, struct rxe_pkt_info *pkt) · line 412
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_net.c +3
-0@@ -401,6 +404,9 @@ static int rxe_loopback(struct sk_buff *skb, struct rxe_pkt_info *pkt)return -EIO ; } +/* remove udp header */ +skb_pull (skb,sizeof (struct udphdr )); +rxe_rcv (skb);return 0 ;
Ignore this. Should have been for-next.