From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 BB1872FE56A for ; Thu, 23 Apr 2026 07:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776930468; cv=none; b=cLC2Yu56LpA9aFfBF+eP8NPoKwra6sFDteikbb8VUVHzZVoIggekNsOrOelholNeFnCezKXOA5s0F7TEEBUuB+QYKjiGgP0MnNAp8vFhvBaPwIzfmJ0rCQ+Uj0lwnM79kWjhVBLL2STYCp0LSTpFFdyy8BiNnvAk9RfSf6GVIpY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776930468; c=relaxed/simple; bh=MaAL9w4ZShSESQtMxf+DFjEZlvuvw9GICxMAfxEkez0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uhqFL9V84aC3B2I5ea77StLkzGmXd7ASuTzCDSYcTWx+kqu7+SLhJJKDvKohhYOLKjR5pTabk9FTlupm9mosnK58J046gEUNCX5l84dWCfSBNf/950Nm58didiPdfEbQ2k0JTlV3o0adPKmIzLz0xVv7XmWf87FzYdT/vmJ0cBk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wkennington.com; spf=none smtp.mailfrom=wkennington.com; dkim=pass (2048-bit key) header.d=wkennington-com.20251104.gappssmtp.com header.i=@wkennington-com.20251104.gappssmtp.com header.b=o7kk9egJ; arc=none smtp.client-ip=74.125.82.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wkennington.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=wkennington.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wkennington-com.20251104.gappssmtp.com header.i=@wkennington-com.20251104.gappssmtp.com header.b="o7kk9egJ" Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-2de831d2b20so3977136eec.1 for ; Thu, 23 Apr 2026 00:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wkennington-com.20251104.gappssmtp.com; s=20251104; t=1776930466; x=1777535266; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=225GaYlXhmnl5g0WRCHES8Fr+uEd19yR1Q+pSrskepw=; b=o7kk9egJ8SzOF33ulB70M0T1b+R3U7WppXR4ezUPWW2JiQsc4RY6oBsKHE1kyU2i2d us74bEE2MyPquW+F6Nvm549R7xHScezM904CkrPY1BCW+JRSbvV4d0mEQdwMKv/4K4OI HgU8DpWwBIdYysyhLGMbBAIM7g9/C9BLoiwtltGOFSGX+UYpn3CIs8B5AeM0bWC2Xkvf ER1KunkKyhQjT5hXN6MegZ1Ig8qU8pel3soavJCpTMLHKn8Zf4g2YjtJpoAWPrbu8DGP v6HmowmU39NGel7EzvGngp/TSsV6k8QdRRjd/JNdp6nRDGmXmKKQy1OvjL+AX96E7wLV pLvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776930466; x=1777535266; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=225GaYlXhmnl5g0WRCHES8Fr+uEd19yR1Q+pSrskepw=; b=nrOZVQJ6C0Z6Q7qSr0Fm8fVqAze+6uja6A9VS7JvTv6B2z6P1XhmUG4HX1CGN6ALIj yBEmjbfbPjRxh/z+nveUu1Drkhz1f8QxcOlSwzFdomV74+F8ouW9/BtgBh3uAgBDpiBu Ng9F0+Skff5KHjZ8DZBod+t0lg7/tcA9RTAJ3N9Qo+x9bm9snAe9E+ARFgUV85njYV6H p9ELbt8Gv4WgiTyT7aFCJ5XqIs6/YS2bc79oL2okHCFc77yl5y4xQiPJiTB++QskHLxS L6U8szBMBUeLnG48AfBImOyPV2BUxaH6isXpo/IJjDrB8TQ8CdQRJY8gM8PhGOlW/e54 JEAw== X-Forwarded-Encrypted: i=1; AFNElJ+CjoRziVOHvzyDZLsUdBh7FtWlC6aka+V/yXloOpHzQuavfJ1DwOEfzZ4P0RoKFKdAF2ZP0PntV6sG6+Y=@vger.kernel.org X-Gm-Message-State: AOJu0YysA9+nFQtPYclpYFrVzNAtlbW1MiPNBjJaZMzJOpvABRWBiwfa Tr3+DbV4Jkz6H23yIksVjVhMFPw/oyygB58hQBDHKaZGGtBhj10rLpbKge+Gt6Dsc/M= X-Gm-Gg: AeBDievmpN6UAHDQgV2oQqgjoD0nBslpYfx45SUaH9eq6nDuEmPx0f6R8+oMyqFvLjU OLYO96mZaD7fusht/I7xd6J/fzCLloXK3wC96MGBLCMv2TL8KkRWZyIWorosirNqqazcoBKOG/r cCslsy4UaVF6lnPsfjzzWIIVbLNDEbTYsj03U6OePsqz+amZpv5wv5jzbWehkIDtgTpP+XbH3f2 fmG7cWupFWmpaCYVlKyZl6cWBi1EJZA5qniQGeucHrEB2YmqBnbLSmCJa7a7Yi0qAO6i6DxDcLm f0w2W523R9Y54QcRXKgWAeWvbzF28x6nEjDjIkYFcUo8YRPDHy+1vSHWXDH2FjUPX0zlOH1CGOu MJz19fMK+gWwQqtHavnGvHuv4QrAZO+lvl5QBmqpfpPuRRix+XDko9ni+LtVQ0DkhCISQgZnnUt cQ2MoUzeRJquN9mFncBTL+Sit+nsjtICw0fEyB8IlAh+0SeTPKQk1BQdWgVkPT2veTLQQrUNKUq Z0v5LlrHxBbyoDdrCxyxDDVYg== X-Received: by 2002:a05:7300:b58a:b0:2d4:62f0:b2d4 with SMTP id 5a478bee46e88-2e4786461b4mr15087024eec.13.1776930465782; Thu, 23 Apr 2026 00:47:45 -0700 (PDT) Received: from wak-linux.svl.corp.google.com ([2a00:79e0:2ed2:c:c318:833d:66c6:43a0]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2e53d9b056fsm35028102eec.29.2026.04.23.00.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 00:47:45 -0700 (PDT) From: "William A. Kennington III" To: Jeremy Kerr , Matt Johnston , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Wolfram Sang Cc: "William A. Kennington III" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2] net: mctp i2c: check length before marking flow active Date: Thu, 23 Apr 2026 00:46:52 -0700 Message-ID: <20260423074741.201460-1-william@wkennington.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260423001517.79219-1-william@wkennington.com> References: <20260423001517.79219-1-william@wkennington.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently, mctp_i2c_get_tx_flow_state() is called before the packet length sanity check. This function marks a new flow as active in the MCTP core. If the sanity check fails, mctp_i2c_xmit() returns early without calling mctp_i2c_lock_nest(). This results in a mismatched locking state: the flow is active, but the I2C bus lock was never acquired for it. When the flow is later released, mctp_i2c_release_flow() will see the active state and queue an unlock marker. The TX thread will then decrement midev->i2c_lock_count from 0, causing it to underflow to -1. This underflow permanently breaks the driver's locking logic, allowing future transmissions to occur without holding the I2C bus lock, leading to bus collisions and potential hardware hangs. Move the mctp_i2c_get_tx_flow_state() call to after the length sanity check to ensure we only transition the flow state if we are actually going to proceed with the transmission and locking. Fixes: f5b8abf9fc3d ("mctp i2c: MCTP I2C binding driver") Signed-off-by: William A. Kennington III --- drivers/net/mctp/mctp-i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mctp/mctp-i2c.c b/drivers/net/mctp/mctp-i2c.c index 15fe4d1163c1..ee2913758e54 100644 --- a/drivers/net/mctp/mctp-i2c.c +++ b/drivers/net/mctp/mctp-i2c.c @@ -496,8 +496,6 @@ static void mctp_i2c_xmit(struct mctp_i2c_dev *midev, struct sk_buff *skb) u8 *pecp; int rc; - fs = mctp_i2c_get_tx_flow_state(midev, skb); - hdr = (void *)skb_mac_header(skb); /* Sanity check that packet contents matches skb length, * and can't exceed MCTP_I2C_BUFSZ @@ -509,6 +507,8 @@ static void mctp_i2c_xmit(struct mctp_i2c_dev *midev, struct sk_buff *skb) return; } + fs = mctp_i2c_get_tx_flow_state(midev, skb); + if (skb_tailroom(skb) >= 1) { /* Linear case with space, we can just append the PEC */ skb_put(skb, 1); -- 2.54.0.545.g6539524ca2-goog