Unverified Commit 1c8b5781 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5680 USB: usbfs: Don't WARN about excessively large memory allocations 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yu Liao <liaoyu15@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JBFTQTD73MZWOETFCSNEZU37GAG4ZVUR/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9BHQL 
 
Link:https://gitee.com/openeuler/kernel/pulls/5680

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 24bce373 1e0bcecb

drivers/usb/core/devio.c

+8 −3
Original line number Diff line number Diff line
@@ -1189,7 +1189,12 @@ static int proc_bulk(struct usb_dev_state *ps, void __user *arg) 
	ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb));

	if (ret)

		return ret;

	tbuf = kmalloc(len1, GFP_KERNEL);



	/*

	 * len1 can be almost arbitrarily large.  Don't WARN if it's

	 * too big, just fail the request.

	 */

	tbuf = kmalloc(len1, GFP_KERNEL | __GFP_NOWARN);

	if (!tbuf) {

		ret = -ENOMEM;

		goto done;
@@ -1630,7 +1635,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb 
	if (num_sgs) {

		as->urb->sg = kmalloc_array(num_sgs,

					    sizeof(struct scatterlist),

					    GFP_KERNEL);

					    GFP_KERNEL | __GFP_NOWARN);

		if (!as->urb->sg) {

			ret = -ENOMEM;

			goto error;
@@ -1665,7 +1670,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb 
					(uurb_start - as->usbm->vm_start);

		} else {

			as->urb->transfer_buffer = kmalloc(uurb->buffer_length,

					GFP_KERNEL);

					GFP_KERNEL | __GFP_NOWARN);

			if (!as->urb->transfer_buffer) {

				ret = -ENOMEM;

				goto error;