From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D126372624; Mon, 23 Jun 2025 21:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750715579; cv=none; b=kvFuRROxv+MuoeC551GzeG/kVShpEzj9CYoAqqx3PFfopgY1c20T335cJSXnwAgVSosz6TqMsO6ybiB4yTh4rmilVM9hkDH/gVL0aQJXJkDICHMeaUyo2QsynAW9eiAgR8n4ons7Wk6E4OFQddL7I0WocAG7rdUqnXyS39epGuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750715579; c=relaxed/simple; bh=yRHGOjbHiqgRd6Wm/tAAUFQUhhpluOeLEkjCaG+z2BQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KgsYPU5TRteGjvQ/ulAh7FTNd8OvDbKUGydzdKGQJQGzpB30N7jHbtBcRQEzQ50euV3/sT5wCFRsRKxGIEhev3d+lMvMib1WlgVmnWzsKPpJMS+hPl5jbm4pOsgxaLUypOqe+nUTBZBeS6Lot6peZchV4oMO4xfIx0w/kF/N6Lc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JpgkzSmu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JpgkzSmu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 679B7C4CEEA; Mon, 23 Jun 2025 21:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750715579; bh=yRHGOjbHiqgRd6Wm/tAAUFQUhhpluOeLEkjCaG+z2BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JpgkzSmuLo7aKf6GqXOTbqNiQA8MDl1BVVkwlHKnQrEI4Stvyqhin+1W0fel8eigg +xEyia1jDmRn40rAWObfWThzEKDy8AUEvR8nLmHFgv03w9XjRz3sq50KGJ5Fc57w36 yEmZ5p84Yo5w6ey9LWhZIK4VRO2f5JPO6sTj0x/g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, maher azz , Matt Porter , Alexandre Bounine , Linus Torvalds , Andrew Morton Subject: [PATCH 6.6 208/290] drivers/rapidio/rio_cm.c: prevent possible heap overwrite Date: Mon, 23 Jun 2025 15:07:49 +0200 Message-ID: <20250623130633.185117212@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130626.910356556@linuxfoundation.org> References: <20250623130626.910356556@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrew Morton commit 50695153d7ddde3b1696dbf0085be0033bf3ddb3 upstream. In riocm_cdev_ioctl(RIO_CM_CHAN_SEND) -> cm_chan_msg_send() -> riocm_ch_send() cm_chan_msg_send() checks that userspace didn't send too much data but riocm_ch_send() failed to check that userspace sent sufficient data. The result is that riocm_ch_send() can write to fields in the rio_ch_chan_hdr which were outside the bounds of the space which cm_chan_msg_send() allocated. Address this by teaching riocm_ch_send() to check that the entire rio_ch_chan_hdr was copied in from userspace. Reported-by: maher azz Cc: Matt Porter Cc: Alexandre Bounine Cc: Linus Torvalds Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/rapidio/rio_cm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/rapidio/rio_cm.c +++ b/drivers/rapidio/rio_cm.c @@ -787,6 +787,9 @@ static int riocm_ch_send(u16 ch_id, void if (buf == NULL || ch_id == 0 || len == 0 || len > RIO_MAX_MSG_SIZE) return -EINVAL; + if (len < sizeof(struct rio_ch_chan_hdr)) + return -EINVAL; /* insufficient data from user */ + ch = riocm_get_channel(ch_id); if (!ch) { riocm_error("%s(%d) ch_%d not found", current->comm,