Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4273f987 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: option: fix port-data abuse 



Commit 8b4c6a3a ("USB: option: Use generic USB wwan code")
moved option port-data allocation to usb_wwan_startup but still cast the
port data to the old struct...

Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1aa3c63c

drivers/usb/serial/option.c

+3 −31
Original line number Diff line number Diff line
@@ -1265,35 +1265,6 @@ static struct usb_serial_driver * const serial_drivers[] = { 


static bool debug;



/* per port private data */



#define N_IN_URB 4

#define N_OUT_URB 4

#define IN_BUFLEN 4096

#define OUT_BUFLEN 4096



struct option_port_private {

	/* Input endpoints and buffer for this port */

	struct urb *in_urbs[N_IN_URB];

	u8 *in_buffer[N_IN_URB];

	/* Output endpoints and buffer for this port */

	struct urb *out_urbs[N_OUT_URB];

	u8 *out_buffer[N_OUT_URB];

	unsigned long out_busy;		/* Bit vector of URBs in use */

	int opened;

	struct usb_anchor delayed;



	/* Settings for the port */

	int rts_state;	/* Handshaking pins (outputs) */

	int dtr_state;

	int cts_state;	/* Handshaking pins (inputs) */

	int dsr_state;

	int dcd_state;

	int ri_state;



	unsigned long tx_start_time[N_OUT_URB];

};



module_usb_serial_driver(serial_drivers, option_ids);



static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
@@ -1367,7 +1338,8 @@ static void option_instat_callback(struct urb *urb) 
	int err;

	int status = urb->status;

	struct usb_serial_port *port =  urb->context;

	struct option_port_private *portdata = usb_get_serial_port_data(port);

	struct usb_wwan_port_private *portdata =

					usb_get_serial_port_data(port);



	dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
@@ -1427,7 +1399,7 @@ static int option_send_setup(struct usb_serial_port *port) 
	struct usb_serial *serial = port->serial;

	struct usb_wwan_intf_private *intfdata =

		(struct usb_wwan_intf_private *) serial->private;

	struct option_port_private *portdata;

	struct usb_wwan_port_private *portdata;

	int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;

	int val = 0;