FAILED: patch "[PATCH] USB: serial: mct_u232: fix memory corruption with small" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 915b36d701950503c4ea0f6e314b10868e59fce3
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060400-renewal-coagulant-3a75@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 915b36d701950503c4ea0f6e314b10868e59fce3 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Wed, 20 May 2026 16:27:00 +0200
Subject: [PATCH] USB: serial: mct_u232: fix memory corruption with small
endpoint
The driver overrides the maximum transfer size for a specific device which only accepts 16 byte packets for its 32 byte bulk-out endpoint.
Make sure to never increase the maximum transfer size to prevent slab corruption should a malicious device report a smaller endpoint max packet size than expected.
drivers/usb/serial/mct_u232.c +11 -10
@@ -378,6 +378,7 @@ static int mct_u232_port_probe(struct usb_serial_port *port) {struct usb_serial *serial = port->serial;struct mct_u232_private *priv; +u16 pid;/* check first to simplify error handling */ if (!serial->port[1 ] || !serial->port[1 ]->interrupt_in_urb) {
@@ -385,6 +386,16 @@ static int mct_u232_port_probe(struct usb_serial_port *port)return -ENODEV ; } +/* +* Compensate for a hardware bug: although the Sitecom U232-P25 +* device reports a maximum output packet size of 32 bytes, +* it seems to be able to accept only 16 bytes (and that's what +* SniffUSB says too...) +*/ + pid =le16_to_cpu (serial->dev->descriptor.idProduct); +if (pid ==MCT_U232_SITECOM_PID ) + port->bulk_out_size =min (16 , port->bulk_out_size); + priv =kzalloc_obj (*priv);if (!priv)return -ENOMEM ;
@@ -410,7 +421,6 @@ static void mct_u232_port_remove(struct usb_serial_port *port)static int mct_u232_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct usb_serial *serial = port->serial;struct mct_u232_private *priv =usb_get_serial_port_data (port);int retval =0 ;unsigned int control_state;
@@ -418,15 +428,6 @@ static int mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)unsigned char last_lcr;unsigned char last_msr; -/* Compensate for a hardware bug: although the Sitecom U232-P25 -* device reports a maximum output packet size of 32 bytes, -* it seems to be able to accept only 16 bytes (and that's what -* SniffUSB says too...) -*/ -if (le16_to_cpu (serial->dev->descriptor.idProduct) - ==MCT_U232_SITECOM_PID ) - port->bulk_out_size =16 ; -/* Do a defined restart: the normal serial device seems to * always turn on DTR and RTS here, so do the same. I'm not * sure if this is really necessary. But it should not harm
Johan Hovold
maintainerPATCH 1/1 USB: serial: mct_u232: fix memory corruption with small endpoint
commit 915b36d701950503c4ea0f6e314b10868e59fce3 upstream.
The driver overrides the maximum transfer size for a specific device which only accepts 16 byte packets for its 32 byte bulk-out endpoint.
Make sure to never increase the maximum transfer size to prevent slab corruption should a malicious device report a smaller endpoint max packet size than expected.
--- drivers/usb/serial/mct_u232.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/usb/serial/mct_u232.c +11 -10
@@ -378,6 +378,7 @@ static int mct_u232_port_probe(struct usb_serial_port *port) {struct usb_serial *serial = port->serial;struct mct_u232_private *priv; +u16 pid;/* check first to simplify error handling */ if (!serial->port[1 ] || !serial->port[1 ]->interrupt_in_urb) {
@@ -385,6 +386,16 @@ static int mct_u232_port_probe(struct usb_serial_port *port)return -ENODEV ; } +/* +* Compensate for a hardware bug: although the Sitecom U232-P25 +* device reports a maximum output packet size of 32 bytes, +* it seems to be able to accept only 16 bytes (and that's what +* SniffUSB says too...) +*/ + pid =le16_to_cpu (serial->dev->descriptor.idProduct); +if (pid ==MCT_U232_SITECOM_PID ) + port->bulk_out_size =min (16 , port->bulk_out_size); + priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ;
@@ -410,7 +421,6 @@ static void mct_u232_port_remove(struct usb_serial_port *port)static int mct_u232_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct usb_serial *serial = port->serial;struct mct_u232_private *priv =usb_get_serial_port_data (port);int retval =0 ;unsigned int control_state;
@@ -418,15 +428,6 @@ static int mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)unsigned char last_lcr;unsigned char last_msr; -/* Compensate for a hardware bug: although the Sitecom U232-P25 -* device reports a maximum output packet size of 32 bytes, -* it seems to be able to accept only 16 bytes (and that's what -* SniffUSB says too...) -*/ -if (le16_to_cpu (serial->dev->descriptor.idProduct) - ==MCT_U232_SITECOM_PID ) - port->bulk_out_size =16 ; -/* Do a defined restart: the normal serial device seems to * always turn on DTR and RTS here, so do the same. I'm not * sure if this is really necessary. But it should not harm
Signature · 1 line
2.53.0
Re: [PATCH 6.18.y] USB: serial: mct_u232: fix memory corruption with small endpoint
Quoted 1 line
[PATCH 6.18.y] USB: serial:
mct_u232: fix memory corruption with small endpoint
Queued for 6.18.y, thanks.
Signature · 2 lines
Thanks, Sasha
Johan Hovold
maintainerRe: [PATCH 6.18.y] USB: serial: mct_u232: fix memory corruption with small endpoint
Quoted 3 lines · Sasha Levin
Quoted 1 line
[PATCH 6.18.y] USB: serial:
mct_u232: fix memory corruption with small endpointQueued for 6.18.y, thanks.
I forgot to mention it here, but this one should also apply to the older trees (I just verified on 5.10).
Johan
Re: [PATCH 6.18.y] USB: serial: mct_u232: fix memory corruption with small endpoint
Quoted 2 lines
I forgot to mention it here, but this one should also apply to the older trees (I just verified on 5.10).
Queued for 6.12, 6.6, 6.1, 5.15 and 5.10 as well, thanks.
--
Thanks,
Sasha