Skip to content

Commit c2dcdaa

Browse files
billauergregkh
authored andcommitted
char: xillybus: Prevent use-after-free due to race condition
commit 282a4b71816b6076029017a7bab3a9dcee12a920 upstream. The driver for XillyUSB devices maintains a kref reference count on each xillyusb_dev structure, which represents a physical device. This reference count reaches zero when the device has been disconnected and there are no open file descriptors that are related to the device. When this occurs, kref_put() calls cleanup_dev(), which clears up the device's data, including the structure itself. However, when xillyusb_open() is called, this reference count becomes tricky: This function needs to obtain the xillyusb_dev structure that relates to the inode's major and minor (as there can be several such). xillybus_find_inode() (which is defined in xillybus_class.c) is called for this purpose. xillybus_find_inode() holds a mutex that is global in xillybus_class.c to protect the list of devices, and releases this mutex before returning. As a result, nothing protects the xillyusb_dev's reference counter from being decremented to zero before xillyusb_open() increments it on its own behalf. Hence the structure can be freed due to a rare race condition. To solve this, a mutex is added. It is locked by xillyusb_open() before the call to xillybus_find_inode() and is released only after the kref counter has been incremented on behalf of the newly opened inode. This protects the kref reference counters of all xillyusb_dev structs from being decremented by xillyusb_disconnect() during this time segment, as the call to kref_put() in this function is done with the same lock held. There is no need to hold the lock on other calls to kref_put(), because if xillybus_find_inode() finds a struct, xillyusb_disconnect() has not made the call to remove it, and hence not made its call to kref_put(), which takes place afterwards. Hence preventing xillyusb_disconnect's call to kref_put() is enough to ensure that the reference doesn't reach zero before it's incremented by xillyusb_open(). It would have been more natural to increment the reference count in xillybus_find_inode() of course, however this function is also called by Xillybus' driver for PCIe / OF, which registers a completely different structure. Therefore, xillybus_find_inode() treats these structures as void pointers, and accordingly can't make any changes. Reported-by: Hyunwoo Kim <[email protected]> Suggested-by: Alan Stern <[email protected]> Signed-off-by: Eli Billauer <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bin Lan <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2f2d48b commit c2dcdaa

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

drivers/char/xillybus/xillyusb.c

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,14 @@ struct xillyusb_dev {
185185
struct mutex process_in_mutex; /* synchronize wakeup_all() */
186186
};
187187

188+
/*
189+
* kref_mutex is used in xillyusb_open() to prevent the xillyusb_dev
190+
* struct from being freed during the gap between being found by
191+
* xillybus_find_inode() and having its reference count incremented.
192+
*/
193+
194+
static DEFINE_MUTEX(kref_mutex);
195+
188196
/* FPGA to host opcodes */
189197
enum {
190198
OPCODE_DATA = 0,
@@ -1234,9 +1242,16 @@ static int xillyusb_open(struct inode *inode, struct file *filp)
12341242
int rc;
12351243
int index;
12361244

1245+
mutex_lock(&kref_mutex);
1246+
12371247
rc = xillybus_find_inode(inode, (void **)&xdev, &index);
1238-
if (rc)
1248+
if (rc) {
1249+
mutex_unlock(&kref_mutex);
12391250
return rc;
1251+
}
1252+
1253+
kref_get(&xdev->kref);
1254+
mutex_unlock(&kref_mutex);
12401255

12411256
chan = &xdev->channels[index];
12421257
filp->private_data = chan;
@@ -1272,8 +1287,6 @@ static int xillyusb_open(struct inode *inode, struct file *filp)
12721287
((filp->f_mode & FMODE_WRITE) && chan->open_for_write))
12731288
goto unmutex_fail;
12741289

1275-
kref_get(&xdev->kref);
1276-
12771290
if (filp->f_mode & FMODE_READ)
12781291
chan->open_for_read = 1;
12791292

@@ -1410,6 +1423,7 @@ static int xillyusb_open(struct inode *inode, struct file *filp)
14101423
return rc;
14111424

14121425
unmutex_fail:
1426+
kref_put(&xdev->kref, cleanup_dev);
14131427
mutex_unlock(&chan->lock);
14141428
return rc;
14151429
}
@@ -2244,7 +2258,9 @@ static void xillyusb_disconnect(struct usb_interface *interface)
22442258

22452259
xdev->dev = NULL;
22462260

2261+
mutex_lock(&kref_mutex);
22472262
kref_put(&xdev->kref, cleanup_dev);
2263+
mutex_unlock(&kref_mutex);
22482264
}
22492265

22502266
static struct usb_driver xillyusb_driver = {

0 commit comments

Comments
 (0)