aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-10-09 11:19:27 -0400
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2014-03-04 18:38:04 -0500
commit5ec9c1771ce83a1e2b7ec96ed9f29a9f1b25e71e (patch)
treef4a0e79c35b289436798007ff06c83b5006cf52f
parent6343e8bf09de16ab4dcae2c6ca1a0e8dbd4dd770 (diff)
usbfs: Kill urbs on interface before doing a set_interface
The usb_set_interface documentation says: * Also, drivers must not change altsettings while urbs are scheduled for * endpoints in that interface; all such urbs must first be completed * (perhaps forced by unlinking). For in kernel drivers we trust the drivers to get this right, but we cannot trust userspace to get this right, so enforce it by killing any urbs still pending on the interface. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-rw-r--r--drivers/usb/core/devio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index f3ba2e076ee3..2a95e4e574bb 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1143,6 +1143,9 @@ static int proc_setintf(struct dev_state *ps, void __user *arg)
1143 return -EFAULT; 1143 return -EFAULT;
1144 if ((ret = checkintf(ps, setintf.interface))) 1144 if ((ret = checkintf(ps, setintf.interface)))
1145 return ret; 1145 return ret;
1146
1147 destroy_async_on_interface(ps, setintf.interface);
1148
1146 return usb_set_interface(ps->dev, setintf.interface, 1149 return usb_set_interface(ps->dev, setintf.interface,
1147 setintf.altsetting); 1150 setintf.altsetting);
1148} 1151}