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

Commit c83deccf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: f_rndis: Fix rndis message parsing of erroneous requests"

parents 24c95392 459ef45b

drivers/usb/gadget/function/f_gsi.c

+6 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,12 @@ static void gsi_rndis_command_complete(struct usb_ep *ep, 
	struct f_gsi *rndis = req->context;

	int status;



	if (req->status != 0) {

		log_event_err("RNDIS command completion error %d\n",

				req->status);

		return;

	}



	status = rndis_msg_parser(rndis->config, (u8 *) req->buf);

	if (status < 0)

		log_event_err("RNDIS command error %d, %d/%d",

drivers/usb/gadget/function/f_qc_rndis.c

+6 −0
Original line number Diff line number Diff line
@@ -564,6 +564,12 @@ static void rndis_qc_command_complete(struct usb_ep *ep, 
	rndis_init_msg_type		*buf;

	u32		ul_max_xfer_size, dl_max_xfer_size;



	if (req->status != 0) {

		pr_err("%s: RNDIS command completion error %d\n",

				__func__, req->status);

		return;

	}



	spin_lock(&rndis_lock);

	rndis = _rndis_qc;

	if (!rndis || !rndis->notify || !rndis->notify->driver_data) {

drivers/usb/gadget/function/f_rndis.c

+6 −0
Original line number Diff line number Diff line
@@ -543,6 +543,12 @@ static void rndis_command_complete(struct usb_ep *ep, struct usb_request *req) 
	int				status;

	rndis_init_msg_type		*buf;



	if (req->status != 0) {

		pr_err("%s: RNDIS command completion error:%d\n",

				__func__, req->status);

		return;

	}



	spin_lock(&_rndis_lock);

	rndis = __rndis;

	if (!rndis || !rndis->notify || !rndis->notify->driver_data) {