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

Commit 32de5efd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: gadget: zero allocate endpoint 0 buffers 



commit 86ebbc11bb3f60908a51f3e41a17e3f477c2eaa3 upstream.

Under some conditions, USB gadget devices can show allocated buffer
contents to a host.  Fix this up by zero-allocating them so that any
extra data will all just be zeros.

Reported-by: default avatarSzymon Heidrich <szymon.heidrich@gmail.com>
Tested-by: default avatarSzymon Heidrich <szymon.heidrich@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13e45e7a

drivers/usb/gadget/composite.c

+1 −1
Original line number Diff line number Diff line
@@ -2159,7 +2159,7 @@ int composite_dev_prepare(struct usb_composite_driver *composite, 
	if (!cdev->req)

		return -ENOMEM;



	cdev->req->buf = kmalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);

	cdev->req->buf = kzalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);

	if (!cdev->req->buf)

		goto fail;

drivers/usb/gadget/legacy/dbgp.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int dbgp_enable_ep_req(struct usb_ep *ep) 
		goto fail_1;

	}



	req->buf = kmalloc(DBGP_REQ_LEN, GFP_KERNEL);

	req->buf = kzalloc(DBGP_REQ_LEN, GFP_KERNEL);

	if (!req->buf) {

		err = -ENOMEM;

		stp = 2;