From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C72B038BF97; Sun, 7 Jun 2026 11:01:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780830069; cv=none; b=cNSkRNIK462dsb7J7VDkqmd3RMCyafoEzty7vrmi2/z0QI+5/GiegSJ9f4ghTsfEz+vmLXhD11pzTSdp7Y7t+KvNhOHyN1fMARZlga/DuCXGOgeC4g0Yy1alkhS9S1HPOmOk/xkmpYAPLeiHJ0OSPVNggbM4+B5EmFjTyvQ8DQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780830069; c=relaxed/simple; bh=yBd24V0dhazaPTcqLZxbsXYj+HZ20HFA2wXCanXgpOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D3hnIZ5u4mqokKekqvqQezEC8AXvKfeGfJsuakYDGad6ocq6LEjlagJm3EP69SlyR9xi0hUZukz1kvNN4C4Qmw2XaLFtzmWdFtE06JDmNMVrsKYpUU/vguQ4F3jQJbPJFioSR7U86N9rq2+eQbeSccpTzAHFN33/E1IiR5s3puI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0ID5ePjx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0ID5ePjx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B8B21F00893; Sun, 7 Jun 2026 11:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780830066; bh=+BAfTvLkz2vLiRT7/zSI0s2zaAcocD4cTjNNlJymltw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0ID5ePjxwW1ib1c/pjzSWLp+mv4ewmLiZsMfykkNb+Uf9/tslP4wOFCXKsXDSNUW5 XLdQz1fGhUwP/JL4busTt01/ApmrPOowPRDR2gNWkOftn/3aW1w3XvRHkR1bve2Mmn 8q8y6b1MIexAdfVkrTy5FmjJUsiJwOTJdL0bsOKc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johan Hovold Subject: [PATCH 6.18 305/315] USB: serial: digi_acceleport: fix memory corruption with small endpoints Date: Sun, 7 Jun 2026 12:01:32 +0200 Message-ID: <20260607095738.807746623@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit cb3560e8eab1dfa1cac1ed52631adf8ec6ff2cd5 upstream. Add the missing bulk-out buffer size sanity checks to avoid out-of-bounds memory accesses or slab corruption should a malicious device report smaller buffers than expected. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Reviewed-by: Greg Kroah-Hartman Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- Should apply also to older trees without kzalloc_obj(). Johan drivers/usb/serial/digi_acceleport.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -1229,15 +1229,34 @@ static int digi_port_init(struct usb_ser static int digi_startup(struct usb_serial *serial) { struct digi_serial *serial_priv; + int oob_port_num; int ret; + int i; + + /* + * The port bulk-out buffers must be large enough for header and + * buffered data. + */ + for (i = 0; i < serial->type->num_ports; i++) { + if (serial->port[i]->bulk_out_size < DIGI_OUT_BUF_SIZE + 2) + return -EINVAL; + } + + /* + * The OOB port bulk-out buffer must be large enough for the two + * commands in digi_set_modem_signals(). + */ + oob_port_num = serial->type->num_ports; + if (serial->port[oob_port_num]->bulk_out_size < 8) + return -EINVAL; serial_priv = kzalloc(sizeof(*serial_priv), GFP_KERNEL); if (!serial_priv) return -ENOMEM; spin_lock_init(&serial_priv->ds_serial_lock); - serial_priv->ds_oob_port_num = serial->type->num_ports; - serial_priv->ds_oob_port = serial->port[serial_priv->ds_oob_port_num]; + serial_priv->ds_oob_port_num = oob_port_num; + serial_priv->ds_oob_port = serial->port[oob_port_num]; ret = digi_port_init(serial_priv->ds_oob_port, serial_priv->ds_oob_port_num);