Skip to content

Commit 7d86aa4

Browse files
YchamePaolo Abeni
authored andcommitted
mctp: route: hold key->lock in mctp_flow_prepare_output()
mctp_flow_prepare_output() checks key->dev and may call mctp_dev_set_key(), but it does not hold key->lock while doing so. mctp_dev_set_key() and mctp_dev_release_key() are annotated with __must_hold(&key->lock), so key->dev access is intended to be serialized by key->lock. The mctp_sendmsg() transmit path reaches mctp_flow_prepare_output() via mctp_local_output() -> mctp_dst_output() without holding key->lock, so the check-and-set sequence is racy. Example interleaving: CPU0 CPU1 ---- ---- mctp_flow_prepare_output(key, devA) if (!key->dev) // sees NULL mctp_flow_prepare_output( key, devB) if (!key->dev) // still NULL mctp_dev_set_key(devB, key) mctp_dev_hold(devB) key->dev = devB mctp_dev_set_key(devA, key) mctp_dev_hold(devA) key->dev = devA // overwrites devB Now both devA and devB references were acquired, but only the final key->dev value is tracked for release. One reference can be lost, causing a resource leak as mctp_dev_release_key() would only decrease the reference on one dev. Fix by taking key->lock around the key->dev check and mctp_dev_set_key() call. Fixes: 67737c4 ("mctp: Pass flow data & flow release events to drivers") Signed-off-by: Chengfeng Ye <dg573847474@gmail.com> Link: https://patch.msgid.link/20260306031402.857224-1-dg573847474@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 950803f commit 7d86aa4

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

net/mctp/route.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,19 +359,22 @@ static void mctp_flow_prepare_output(struct sk_buff *skb, struct mctp_dev *dev)
359359
{
360360
struct mctp_sk_key *key;
361361
struct mctp_flow *flow;
362+
unsigned long flags;
362363

363364
flow = skb_ext_find(skb, SKB_EXT_MCTP);
364365
if (!flow)
365366
return;
366367

367368
key = flow->key;
368369

369-
if (key->dev) {
370+
spin_lock_irqsave(&key->lock, flags);
371+
372+
if (!key->dev)
373+
mctp_dev_set_key(dev, key);
374+
else
370375
WARN_ON(key->dev != dev);
371-
return;
372-
}
373376

374-
mctp_dev_set_key(dev, key);
377+
spin_unlock_irqrestore(&key->lock, flags);
375378
}
376379
#else
377380
static void mctp_skb_set_flow(struct sk_buff *skb, struct mctp_sk_key *key) {}

0 commit comments

Comments
 (0)