linux.git/drivers/usb/gadget/function/f_fs.c, branch v4.10

usb: gadget: f_fs: Assorted buffer overflow checks.

2017-01-25T11:03:52+00:00

OS descriptor head, when flagged as provided, is accessed without
checking if it fits in provided buffer. Verify length before access.
Also, there are other places where buffer length it checked
after accessing offsets which are potentially past the end. Check
buffer length before as well to fail cleanly.

Signed-off-by: Vincent Pelletier 
Acked-by: Felipe Balbi 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

usb: gadget: f_fs: Fix iterations on endpoints.

2017-01-12T08:00:30+00:00

When zero endpoints are declared for a function, there is no endpoint
to disable, enable or free, so replace do...while loops with while loops.
Change pre-decrement to post-decrement to iterate the same number of times
when there are endpoints to process.

Signed-off-by: Vincent Pelletier 
Signed-off-by: Felipe Balbi

usb: gadget: f_fs: Fix possibe deadlock

2017-01-02T08:55:28+00:00

When system try to close /dev/usb-ffs/adb/ep0 on one core, at the same
time another core try to attach new UDC, which will cause deadlock as
below scenario. Thus we should release ffs lock before issuing
unregister_gadget_item().

[   52.642225] c1 ======================================================
[   52.642228] c1 [ INFO: possible circular locking dependency detected ]
[   52.642236] c1 4.4.6+ #1 Tainted: G        W  O
[   52.642241] c1 -------------------------------------------------------
[   52.642245] c1 usb ffs open/2808 is trying to acquire lock:
[   52.642270] c0  (udc_lock){+.+.+.}, at: []
		usb_gadget_unregister_driver+0x3c/0xc8
[   52.642272] c1  but task is already holding lock:
[   52.642283] c0  (ffs_lock){+.+.+.}, at: []
		ffs_data_clear+0x30/0x140
[   52.642285] c1 which lock already depends on the new lock.
[   52.642287] c1
               the existing dependency chain (in reverse order) is:
[   52.642295] c0
	       -> #1 (ffs_lock){+.+.+.}:
[   52.642307] c0        [] __lock_acquire+0x20f0/0x2238
[   52.642314] c0        [] lock_acquire+0xe4/0x298
[   52.642322] c0        [] mutex_lock_nested+0x7c/0x3cc
[   52.642328] c0        [] ffs_func_bind+0x504/0x6e8
[   52.642334] c0        [] usb_add_function+0x84/0x184
[   52.642340] c0        [] configfs_composite_bind+0x264/0x39c
[   52.642346] c0        [] udc_bind_to_driver+0x58/0x11c
[   52.642352] c0        [] usb_udc_attach_driver+0x90/0xc8
[   52.642358] c0        [] gadget_dev_desc_UDC_store+0xd4/0x128
[   52.642369] c0        [] configfs_write_file+0xd0/0x13c
[   52.642376] c0        [] vfs_write+0xb8/0x214
[   52.642381] c0        [] SyS_write+0x54/0xb0
[   52.642388] c0        [] el0_svc_naked+0x24/0x28
[   52.642395] c0
              -> #0 (udc_lock){+.+.+.}:
[   52.642401] c0        [] print_circular_bug+0x84/0x2e4
[   52.642407] c0        [] __lock_acquire+0x2138/0x2238
[   52.642412] c0        [] lock_acquire+0xe4/0x298
[   52.642420] c0        [] mutex_lock_nested+0x7c/0x3cc
[   52.642427] c0        [] usb_gadget_unregister_driver+0x3c/0xc8
[   52.642432] c0        [] unregister_gadget_item+0x28/0x44
[   52.642439] c0        [] ffs_data_clear+0x138/0x140
[   52.642444] c0        [] ffs_data_reset+0x20/0x6c
[   52.642450] c0        [] ffs_data_closed+0xac/0x12c
[   52.642454] c0        [] ffs_ep0_release+0x20/0x2c
[   52.642460] c0        [] __fput+0xb0/0x1f4
[   52.642466] c0        [] ____fput+0x20/0x2c
[   52.642473] c0        [] task_work_run+0xb4/0xe8
[   52.642482] c0        [] do_exit+0x360/0xb9c
[   52.642487] c0        [] do_group_exit+0x4c/0xb0
[   52.642494] c0        [] get_signal+0x380/0x89c
[   52.642501] c0        [] do_signal+0x154/0x518
[   52.642507] c0        [] do_notify_resume+0x70/0x78
[   52.642512] c0        [] work_pending+0x1c/0x20
[   52.642514] c1
              other info that might help us debug this:
[   52.642517] c1  Possible unsafe locking scenario:
[   52.642518] c1        CPU0                    CPU1
[   52.642520] c1        ----                    ----
[   52.642525] c0   lock(ffs_lock);
[   52.642529] c0                                lock(udc_lock);
[   52.642533] c0                                lock(ffs_lock);
[   52.642537] c0   lock(udc_lock);
[   52.642539] c1
                      *** DEADLOCK ***
[   52.642543] c1 1 lock held by usb ffs open/2808:
[   52.642555] c0  #0:  (ffs_lock){+.+.+.}, at: []
		ffs_data_clear+0x30/0x140
[   52.642557] c1 stack backtrace:
[   52.642563] c1 CPU: 1 PID: 2808 Comm: usb ffs open Tainted: G
[   52.642565] c1 Hardware name: Spreadtrum SP9860g Board (DT)
[   52.642568] c1 Call trace:
[   52.642573] c1 [] dump_backtrace+0x0/0x170
[   52.642577] c1 [] show_stack+0x20/0x28
[   52.642583] c1 [] dump_stack+0xa8/0xe0
[   52.642587] c1 [] print_circular_bug+0x1fc/0x2e4
[   52.642591] c1 [] __lock_acquire+0x2138/0x2238
[   52.642595] c1 [] lock_acquire+0xe4/0x298
[   52.642599] c1 [] mutex_lock_nested+0x7c/0x3cc
[   52.642604] c1 [] usb_gadget_unregister_driver+0x3c/0xc8
[   52.642608] c1 [] unregister_gadget_item+0x28/0x44
[   52.642613] c1 [] ffs_data_clear+0x138/0x140
[   52.642618] c1 [] ffs_data_reset+0x20/0x6c
[   52.642621] c1 [] ffs_data_closed+0xac/0x12c
[   52.642625] c1 [] ffs_ep0_release+0x20/0x2c
[   52.642629] c1 [] __fput+0xb0/0x1f4
[   52.642633] c1 [] ____fput+0x20/0x2c
[   52.642636] c1 [] task_work_run+0xb4/0xe8
[   52.642640] c1 [] do_exit+0x360/0xb9c
[   52.642644] c1 [] do_group_exit+0x4c/0xb0
[   52.642647] c1 [] get_signal+0x380/0x89c
[   52.642651] c1 [] do_signal+0x154/0x518
[   52.642656] c1 [] do_notify_resume+0x70/0x78
[   52.642659] c1 [] work_pending+0x1c/0x20

Acked-by: Michal Nazarewicz 
Signed-off-by: Baolin Wang 
Signed-off-by: Felipe Balbi

usb: gadget: f_fs: Fix ExtCompat descriptor validation

2017-01-02T08:55:28+00:00

Reserved1 is documented as expected to be set to 0, but this test fails
when it it set to 0. Reverse the condition.

Signed-off-by: Vincent Pelletier 
Signed-off-by: Felipe Balbi

usb: gadget: f_fs: Document eventfd effect on descriptor format.

2017-01-02T08:55:28+00:00

When FUNCTIONFS_EVENTFD flag is set, __ffs_data_got_descs reads a 32bits,
little-endian value right after the fixed structure header, and passes it
to eventfd_ctx_fdget. Document this.

Also, rephrase a comment to be affirmative about the role of string
descriptor at index 0. Ref: USB 2.0 spec paragraph "9.6.7 String", and
also checked to still be current in USB 3.0 spec paragraph "9.6.9 String".

Signed-off-by: Vincent Pelletier 
Signed-off-by: Felipe Balbi

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2016-12-16T18:24:44+00:00

Pull vfs updates from Al Viro:

 - more ->d_init() stuff (work.dcache)

 - pathname resolution cleanups (work.namei)

 - a few missing iov_iter primitives - copy_from_iter_full() and
   friends. Either copy the full requested amount, advance the iterator
   and return true, or fail, return false and do _not_ advance the
   iterator. Quite a few open-coded callers converted (and became more
   readable and harder to fuck up that way) (work.iov_iter)

 - several assorted patches, the big one being logfs removal

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  logfs: remove from tree
  vfs: fix put_compat_statfs64() does not handle errors
  namei: fold should_follow_link() with the step into not-followed link
  namei: pass both WALK_GET and WALK_MORE to should_follow_link()
  namei: invert WALK_PUT logics
  namei: shift interpretation of LOOKUP_FOLLOW inside should_follow_link()
  namei: saner calling conventions for mountpoint_last()
  namei.c: get rid of user_path_parent()
  switch getfrag callbacks to ..._full() primitives
  make skb_add_data,{_nocache}() and skb_copy_to_page_nocache() advance only on success
  [iov_iter] new primitives - copy_from_iter_full() and friends
  don't open-code file_inode()
  ceph: switch to use of ->d_init()
  ceph: unify dentry_operations instances
  lustre: switch to use of ->d_init()

[iov_iter] new primitives - copy_from_iter_full() and friends

2016-12-05T19:33:36+00:00

copy_from_iter_full(), copy_from_iter_full_nocache() and
csum_and_copy_from_iter_full() - counterparts of copy_from_iter()
et.al., advancing iterator only in case of successful full copy
and returning whether it had been successful or not.

Convert some obvious users.  *NOTE* - do not blindly assume that
something is a good candidate for those unless you are sure that
not advancing iov_iter in failure case is the right thing in
this case.  Anything that does short read/short write kind of
stuff (or is in a loop, etc.) is unlikely to be a good one.

Signed-off-by: Al Viro

Merge 4.9-rc7 into usb-next

2016-11-28T07:34:10+00:00

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman

usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()

2016-11-18T11:50:37+00:00

Properly check the return code of ffs_func_revmap_intf() and
ffs_func_revmap_ep() for a non-negative value.

Instead of checking the return code, the comparison was performed for the last
parameter of the function calls, because of wrong parenthesis.

This also fixes the following static checker warning:
drivers/usb/gadget/function/f_fs.c:3152 ffs_func_req_match()
warn: always true condition '(((creq->wIndex)) >= 0) => (0-u16max >= 0)'

Reported-by: Dan Carpenter 
Signed-off-by: Felix Hädicke 
Signed-off-by: Felipe Balbi

usb: gadget: f_fs: use complete() instead complete_all()

2016-11-03T08:38:38+00:00

There is only one waiter for the completion, therefore there
is no need to use complete_all(). Let's make that clear by
using complete() instead of complete_all().

The usage pattern of the completion is:

waiter context                          waker context
  reinit_completion()
  usb_esp_queue()
  wait_for_completion_interruptible()

					ffs_ep0_complete()
					  complete()

Acked-by: Michal Nazarewicz 
Signed-off-by: Daniel Wagner 
Cc: Felipe Balbi 
Cc: Michal Nazarewicz 
Cc: Greg Kroah-Hartman 
Cc: linux-usb@vger.kernel.org
Signed-off-by: Felipe Balbi