From nobody Thu Apr 9 13:32:15 2026 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49917368277 for ; Fri, 6 Mar 2026 03:14:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772766852; cv=none; b=KyCxSZtM4S5EnuaJ10nlVEl3UVqTxj01HBdH9E8V8EV7P8eOq8JK5mHXo1qwsEdqu+RX5oM/lYlfVhPhZJtL4w3fjW5DzmJpotr2+xJUauz+jipxu3X9XwUSu0Z40Ves48O+BZc98HvCUvOADVGL6tmoFr3JnUAK5xLv6BwZMdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772766852; c=relaxed/simple; bh=ckTCUOoiVNYeEw/M1IXNtDeSz8draygJacRfDD11QLw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Jra5RGFpSKXiPmPtWi9mud7qbdPPpsyTqn5u/H2ldPfjuVEiOWtWRhwt3yQAg7TR+vjm8CYqTut/h1IQuNxYxcKOvx7ahEV3NRauCZZP91ECuXOHNFzZC+yJqIHnnAXCqtAhzbJ6sTRjnUqYOnAxhKdr4SWRhVdHAFkxlrehBTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L+iQM0m1; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L+iQM0m1" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c73819dd2daso340998a12.2 for ; Thu, 05 Mar 2026 19:14:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772766850; x=1773371650; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GAKk9BLlPBGd+3xOdk2XRyvunkKExwApsKu0QsVvEfo=; b=L+iQM0m1bH7knQFT+BgbZ431B64R2E99qTPmefwUADWKexlN2vSd6NBSzS0p3lA2vN 72cHxND6nHIEMwxhcN0nmZ84jpv4+4DLA/3wvA19VSwRCdNZ4E6sGc7ID/bZQUua71gQ 18DhBJ5KRd860pT5uxVJ7e7YBo7Jok2FZFbbOoraxqD5JWzPRif1BnwJc/tH99Elb/Ew gKpcM+vCb5d0ii8/6HQDkt8J/CvTs0cQWu4CLha1J0AbHvuq9d3tD+7sAS0uykfRiurR t2htM4aNEg4qU39TtG8KLdSKSes5mgKv9NU95iPyuyyul7ANJCGpzWA+TuQ2VA82Vygi Zt8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772766850; x=1773371650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GAKk9BLlPBGd+3xOdk2XRyvunkKExwApsKu0QsVvEfo=; b=lkYijm6bTL8AhKNtkNAsf0n8kW65b21EtBYM6F+nYIT13gfLFzto6K0myfr+7BjdS6 IGvBqFU0EIYh4ADOKEN1OMKzV3+FA8UTwFtkZtmgMwVagg8BQGU865UVQIp0+LVid0rg qhdPF/MYEKip+yBbD+UwlkGg55VxvC9tAzKfDrBZ8S0DuBaflWxWcEKNzszvSjyzOhFc j3Y/8BgUMki9Haz8JgnF0dZG5ekhQigwo1UVzU3TOiBopRisqJKUxrT/qJPIV50tmN4l 6Uejs29WIK/2DtNQbQmnkSsxdhHhl0sunhhzI9xvsE01HTQqFzcx47wFGfB/NTpRCm2L cr/A== X-Forwarded-Encrypted: i=1; AJvYcCW7itdoYCM0zYA6EH/OAiaAmTQ4qCm4kRLnNuoLjDLOBDBLYHtAVHGRF/1WHVbPeuQXYvAp7R7Inp3Zo74=@vger.kernel.org X-Gm-Message-State: AOJu0YxIBe0QJ8Dh/ovoxrq5qB7LBsY7Yg1Ls7hx5BBZhIOErX4mEiBm yL5KKOgKOCynpZO7snDHvC7m0tnvYRGvJJX3mgwAGdJUVraUUWsxCNIB X-Gm-Gg: ATEYQzyPzpVLXn+h5eD3ScrXAtcL2PSPKWatGCzWG2bHhM1LCzfkRapBht7OoQuARHy uxAFtKZZQfH/nJEoopJKxwdM76X1Azlwan934eZnHyGjbiBa3GhUu7MtlL7mzbED5CedulN4+dQ LSKz/yz8l6/9QtFPMY/ybs4j1sgOoVa4P9/dOuPX5AIZzG0M8jLr0S1CanJK02rdjTUtvkpyngN gIjAJ8PGzJwoO+obyJ4FP+4Lc2oLHRO+s9fUWVQyvzCGZ1ApbqlTQevZ1x8sajHlW2s9qtdvMSc becpX5viyMENejcMls4TyuFETm9/rFk6dOLq2VhBdyfI2OnSVUlW1RO4NY5NoC+WfLknMpjNoLl BEouyAv4rChLGLQAFmggeEk4L0yc5A31c8Bo9fVyVBdAsIpPThme00VfMuvNQQsiqsQqdHlXm+p FK5mrREuhgKWz8gYms7UXAk2wi2KrLYHL7StoU/dvvxSClvSpAhtoo+ei5r8rnkH0kIjK9FHg= X-Received: by 2002:a05:6a00:8d4:b0:821:8145:6948 with SMTP id d2e1a72fcca58-829a2f90d65mr429767b3a.7.1772766849425; Thu, 05 Mar 2026 19:14:09 -0800 (PST) Received: from 3ce1e5d2d1b2.cse.ust.hk (191host009.mobilenet.cse.ust.hk. [143.89.191.9]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829a465b6c7sm144405b3a.25.2026.03.05.19.14.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 19:14:08 -0800 (PST) From: Chengfeng Ye To: jk@codeconstruct.com.au, matt@codeconstruct.com.au, netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, linux-kernel@vger.kernel.org, Chengfeng Ye Subject: [PATCH v3] mctp: route: hold key->lock in mctp_flow_prepare_output() Date: Fri, 6 Mar 2026 03:14:02 +0000 Message-Id: <20260306031402.857224-1-dg573847474@gmail.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D devB mctp_dev_set_key(devA, key) mctp_dev_hold(devA) key->dev =3D 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: 67737c457281 ("mctp: Pass flow data & flow release events to drivers= ") Signed-off-by: Chengfeng Ye --- v2: Add fix tag v3: Shift mctp_dev_set_key() to else block and invert the branch logic=20 --- net/mctp/route.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/mctp/route.c b/net/mctp/route.c index 0381377ab760..59ad60b88563 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -359,6 +359,7 @@ static void mctp_flow_prepare_output(struct sk_buff *sk= b, struct mctp_dev *dev) { struct mctp_sk_key *key; struct mctp_flow *flow; + unsigned long flags; =20 flow =3D skb_ext_find(skb, SKB_EXT_MCTP); if (!flow) @@ -366,12 +367,14 @@ static void mctp_flow_prepare_output(struct sk_buff *= skb, struct mctp_dev *dev) =20 key =3D flow->key; =20 - if (key->dev) { + spin_lock_irqsave(&key->lock, flags); + + if (!key->dev) + mctp_dev_set_key(dev, key); + else WARN_ON(key->dev !=3D dev); - return; - } =20 - mctp_dev_set_key(dev, key); + spin_unlock_irqrestore(&key->lock, flags); } #else static void mctp_skb_set_flow(struct sk_buff *skb, struct mctp_sk_key *key= ) {} --=20 2.25.1