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

Commit c7ee20d5 authored by Andrey Konovalov's avatar Andrey Konovalov
Browse files

UPSTREAM: usb: raw-gadget: fix null-ptr-deref when reenabling endpoints 



Currently we preassign gadget endpoints to raw-gadget endpoints during
initialization. Fix resetting this assignment in raw_ioctl_ep_disable(),
otherwise we will get null-ptr-derefs when an endpoint is reenabled.

Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Bug: 147413187
(cherry picked from commit da39b5ee40bc00ae3edb4ae4e205b10bc52f980e)
Change-Id: I6809cfdeeadf5fda4071a2f088cd525a1640872d
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
parent d31e0b95

drivers/usb/gadget/legacy/raw_gadget.c

+0 −1
Original line number Diff line number Diff line
@@ -867,7 +867,6 @@ static int raw_ioctl_ep_disable(struct raw_dev *dev, unsigned long value) 
	spin_lock_irqsave(&dev->lock, flags);

	usb_ep_free_request(dev->eps[i].ep, dev->eps[i].req);

	kfree(dev->eps[i].ep->desc);

	dev->eps[i].ep = NULL;

	dev->eps[i].state = STATE_EP_DISABLED;

	dev->eps[i].disabling = false;