Skip to content

Commit

Permalink
RDMA/rxe: Fix seg fault in rxe_comp_queue_pkt
Browse files Browse the repository at this point in the history
commit 2b23b60 upstream.

In rxe_comp_queue_pkt() an incoming response packet skb is enqueued to the
resp_pkts queue and then a decision is made whether to run the completer
task inline or schedule it. Finally the skb is dereferenced to bump a 'hw'
performance counter. This is wrong because if the completer task is
already running in a separate thread it may have already processed the skb
and freed it which can cause a seg fault.  This has been observed
infrequently in testing at high scale.

This patch fixes this by changing the order of enqueuing the packet until
after the counter is accessed.

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Bob Pearson <[email protected]>
Fixes: 0b1e5b9 ("IB/rxe: Add port protocol stats")
Signed-off-by: Jason Gunthorpe <[email protected]>
[Sherry: bp to fix CVE-2024-38544. Fix conflict due to missing commit:
dccb23f ("RDMA/rxe: Split rxe_run_task() into two subroutines")
which is not necessary to backport]
Signed-off-by: Sherry Yang <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Bob Pearson authored and gregkh committed Oct 17, 2024
1 parent 41cf6f2 commit e0e14dd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/infiniband/sw/rxe/rxe_comp.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ void rxe_comp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb)
{
int must_sched;

skb_queue_tail(&qp->resp_pkts, skb);

must_sched = skb_queue_len(&qp->resp_pkts) > 1;
must_sched = skb_queue_len(&qp->resp_pkts) > 0;
if (must_sched != 0)
rxe_counter_inc(SKB_TO_PKT(skb)->rxe, RXE_CNT_COMPLETER_SCHED);

skb_queue_tail(&qp->resp_pkts, skb);

rxe_run_task(&qp->comp.task, must_sched);
}

Expand Down

0 comments on commit e0e14dd

Please sign in to comment.