From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.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 285092F5313 for ; Tue, 23 Jun 2026 15:51:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782229906; cv=none; b=av0sI9cljdPa00l3xEfwpst2ycmC0vGjglG3tbuJzJpRpbeGD02ZzSh7wYn9cUwn6C90v5chbTHCMuVIghBbjhvKXjnq63TUEeyG9G11dCo12HN9LjcG5IcY1I7uq0gN9ByVqHtvI3HcJ70D2f5fB3GXxalo1XDI6aaHF0Mm+wI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782229906; c=relaxed/simple; bh=t8mXf1KWzBFFHZItSaMJ1BAc0QXxY+Opyx4omfe868o=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=U5kbGjy3f7MRshcR0oNtAftbIXqL2NuU2KqlKJwx1ZTb8ysbBdNGBq8T8GBznZClbs5BoFOontNbnl7u6whLCr09c6GN0BwL4x4sfAcvbGOXbeH0G6nLwCZwrsnKvwnFWQzR5KCIXc7mv7RsbqsOBnlax+mpXNoqzrg8Zywvthg= 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=UglRfJhW; arc=none smtp.client-ip=209.85.210.182 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="UglRfJhW" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8453f568e84so111013b3a.0 for ; Tue, 23 Jun 2026 08:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782229904; x=1782834704; darn=vger.kernel.org; h=mime-version:content-transfer-encoding:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j9NNaAQXxA7tp5h7ZzpX9ErwD3n1HZRKdmhW285xKfA=; b=UglRfJhWKHlLdsoCguVvp3apAqNTjg9nHv/v7C2EWUpqoBywT4r8r9ViQsJcdT0+Z2 Pml48DzI5qBkzNhKgdrpvbdVvcEa5ktojS/nfgYhrpt3jpKdfRSh4lVsuW02R3zfsml0 fy6I6jxN8G6YHDBOeASoUrro+q6dMNYJx76ijnaNfiew+j0TQP/+imhf5gl+NQM4MJA6 bzOJRXv+VX7NAd2he1F6L0opJGk94MDJs9HGUWLWgXXIjXPmM9KGO+G6nlwihzCA/vgs r+9ijCSe+wMvQuGPBpbbLsWxB3f5PyXqt4PXsNTOQmE3Hwzw5IIEbea4XTaA+tn9C6gt xzuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782229904; x=1782834704; h=mime-version:content-transfer-encoding:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=j9NNaAQXxA7tp5h7ZzpX9ErwD3n1HZRKdmhW285xKfA=; b=pTn60PlkEAyEUR0Ifd46Unt1CxEqz+X8XxI/5jVNNyEvUNsB8+Vx6Al+5C9jMi1v6W JDnitxtRZvSFVIR8eBV6kkThqaII4lWb1Y3xdXVwPuyPLrdA6YhWjFYffaa/o4vNTIeo rmzm0uqFzYalSHqOTQajMWt5qj1NrA6OBCIPRE9zhbKfjjRcrriBbq3LtURCBc+0RxoD 7+gFCCDjtD8Vqlciv2A8o6Wf89oPF7upv5nGT9YWT1M6WiqVKSvDcIPbJvlP/JYvBNXi X+TI3uHEhVBrxJu8QvR+6K4aKAx6jQmJ2htQbXxfMuu7RdVtHKokwIXDJ7H8DA6wjCP4 hXvA== X-Forwarded-Encrypted: i=1; AFNElJ+S6lkwUaIVPNyW2opkV/fo3vqhV4imySv96IbPOuBGEGc4tDMumqK8luU1AHdUnWvnWD7G0BC+GEa/G0Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yztd088T955gtKNQY3LPPNO2/MC/Kj75PDY8SBR/CMq8UNrlroG ac44LyHF5QbqAu4s1ortIHGQ+RihIICZPJ4AMhKrm/rtOlPWqWdqKEm6 X-Gm-Gg: AfdE7cm045/vQsk4SLZYvN2A86Q19c1Ow5a05eNzlDDIbWvOeAswdGorgvcNuejNwEg rLt+ZZ0iuOf/7nVt0n/92vmpAHlImdfi3oL2XUKOyCSuNqluRuEKtqE7s3CajWkv2xy8VpwJDg/ +K2ollM/79P59riEJ0UXo0zqkgweaA+MH5GTOgTWDM6qRceA5cen2TWibhKooYOJ8u8pT20F+F/ nGWfeUgeYiWIM/H3ZrisChEDDB0z7YYbSfGmrBnQIULOkFviKEyFqYlJg0RqZQ32gBvSHdDWE6Z MpMa1oCX80BfyvMLuOi1MvXjmUzF9ilju5B+El44ZQGcAgMZlPfoDDccNnE+Ir1S7Xo8ZJUSX1Q MrW2l09h9Ef5CJHlQmIbmN8kSdxF+ySHVwCjrlpp42I5YBlnEaapbRgUKuWfh972P+axoixVzyh PHb3WVEWpaSwWBpEWdNplbcDYsW0DKsE5Wwif+hA== X-Received: by 2002:a05:6a00:4004:b0:845:4c76:e46a with SMTP id d2e1a72fcca58-845952108a1mr4322078b3a.3.1782229904262; Tue, 23 Jun 2026 08:51:44 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84564ebcf45sm10418471b3a.48.2026.06.23.08.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 08:51:43 -0700 (PDT) From: Maoyi Xie To: Miquel Raynal , Frank Li Cc: Alexandre Belloni , Kaixuan Li , linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] i3c: master: svc: bound IBI payload to the requested max_payload_len Date: Tue, 23 Jun 2026 23:51:40 +0800 Message-ID: <178222990006.2767135.12462569914183698733@maoyixie.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 svc_i3c_master_handle_ibi() reads the IBI payload from the RX FIFO into the IBI slot. The loop is bounded by the hardware FIFO size (SVC_I3C_FIFO_SIZE), not by the slot size. slot->data points into the IBI pool, which i3c_generic_ibi_alloc_pool() sizes at max_payload_len per slot. svc_i3c_master_request_ibi() only rejects a max_payload_len larger than SVC_I3C_FIFO_SIZE, so a driver can request a smaller one. mctp-i3c requests 1. Each readsb() then copies the controller RXCOUNT bytes (up to 31) with no check against the slot size. A device that sends more bytes than the slot holds writes past slot->data, an out-of-bounds write into the IBI pool. Bound the loop by dev->ibi->max_payload_len and clamp each read to the space left in the slot, the same way dw-i3c does. Fixes: dd3c52846d59 ("i3c: master: svc: Add Silvaco I3C master driver") Cc: stable@vger.kernel.org Co-developed-by: Kaixuan Li Signed-off-by: Kaixuan Li Signed-off-by: Maoyi Xie --- drivers/i3c/master/svc-i3c-master.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c index e2d99a3ac07d..7420bfbdd259 100644 --- a/drivers/i3c/master/svc-i3c-master.c +++ b/drivers/i3c/master/svc-i3c-master.c @@ -465,9 +465,11 @@ static int svc_i3c_master_handle_ibi(struct svc_i3c_master *master, buf = slot->data; while (SVC_I3C_MSTATUS_RXPEND(readl(master->regs + SVC_I3C_MSTATUS)) && - slot->len < SVC_I3C_FIFO_SIZE) { + slot->len < dev->ibi->max_payload_len) { mdatactrl = readl(master->regs + SVC_I3C_MDATACTRL); count = SVC_I3C_MDATACTRL_RXCOUNT(mdatactrl); + count = min_t(unsigned int, count, + dev->ibi->max_payload_len - slot->len); readsb(master->regs + SVC_I3C_MRDATAB, buf, count); slot->len += count; buf += count;