litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Matthias Kaehlcke <matthias.kaehlcke@gmail.com>	2007-07-31 04:37:24 -0400
committer	David S. Miller <davem@davemloft.net>	2007-07-31 04:37:24 -0400
commit	2fa3195d72f7d0cfb4dcb2b0dfa265ed0fa5cfa3 (patch)
tree	89da0b8ac2776f104d7852b27d0aaba47ab953a1 /drivers/sbus
parent	e5071b5493b1dcfa98a6e8a75f56997f6d4a0c25 (diff)

[SPARC] Videopix Frame Grabber: Fix unreleased lock in vfc_debug()

Videopix Frame Grabber: vfc_debug() doesn't release the device lock when copy_from_user() fails Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>

Diffstat (limited to 'drivers/sbus')

-rw-r--r--

drivers/sbus/char/vfc_dev.c

1 files changed, 1 insertions, 0 deletions


diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index 26b1d2a17ed2..9269f7fbd363 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c
@@ -248,6 +248,7 @@ static int vfc_debug(struct vfc_dev dev, int cmd, void __user argp)
248	buffer,inout.len);	248	buffer,inout.len);
249		249
250	if (copy_to_user(argp,&inout,sizeof(inout))) {	250	if (copy_to_user(argp,&inout,sizeof(inout))) {
		251	vfc_unlock_device(dev);
251	kfree(buffer);	252	kfree(buffer);
252	return -EFAULT;	253	return -EFAULT;
253	}	254	}

/* * drivers/pci/bus.c * * From setup-res.c, by: * Dave Rusling (david.rusling@reo.mts.dec.com) * David Mosberger (davidm@cs.arizona.edu) * David Miller (davem@redhat.com) * Ivan Kokshaysky (ink@jurassic.park.msu.ru) */ #include <linux/module.h> #include <linux/kernel.h> #include <linux/pci.h> #include <linux/errno.h> #include <linux/ioport.h> #include <linux/proc_fs.h> #include <linux/init.h> #include "pci.h" /** * pci_bus_alloc_resource - allocate a resource from a parent bus * @bus: PCI bus * @res: resource to allocate * @size: size of resource to allocate * @align: alignment of resource to allocate * @min: minimum /proc/iomem address to allocate * @type_mask: IORESOURCE_* type flags * @alignf: resource alignment function * @alignf_data: data argument for resource alignment function * * Given the PCI bus a device resides on, the size, minimum address, * alignment and type, try to find an acceptable resource allocation * for a specific device resource. */ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, resource_size_t align, resource_size_t min, unsigned int type_mask, void (*alignf)(void *, struct resource *, resource_size_t, resource_size_t), void *alignf_data) { int i, ret = -ENOMEM; type_mask |= IORESOURCE_IO | IORESOURCE_MEM; for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { struct resource *r = bus->resource[i]; if (!r) continue; /* type_mask must match */ if ((res->flags ^ r->flags) & type_mask) continue; /* We cannot allocate a non-prefetching resource from a pre-fetching area */ if ((r->flags & IORESOURCE_PREFETCH) && !(res->flags & IORESOURCE_PREFETCH)) continue; /* Ok, try it out.. */ ret = allocate_resource(r, res, size, r->start ? : min, -1, align, alignf, alignf_data); if (ret == 0) break; } return ret; } /** * add a single device * @dev: device to add * * This adds a single pci device to the global * device list and adds sysfs and procfs entries */ void __devinit pci_bus_add_device(struct pci_dev *dev) { device_add(&dev->dev); down_write(&pci_bus_sem); list_add_tail(&dev->global_list, &pci_devices); up_write(&pci_bus_sem); pci_proc_attach_device(dev); pci_create_sysfs_dev_files(dev); } /** * pci_bus_add_devices - insert newly discovered PCI devices * @bus: bus to check for new devices * * Add newly discovered PCI devices (which are on the bus->devices * list) to the global PCI device list, add the sysfs and procfs * entries. Where a bridge is found, add the discovered bus to * the parents list of child buses, and recurse (breadth-first * to be compatible with 2.4) * * Call hotplug for each new devices. */ void __devinit pci_bus_add_devices(struct pci_bus *bus) { struct pci_dev *dev; list_for_each_entry(dev, &bus->devices, bus_list) { /* * Skip already-present devices (which are on the * global device list.) */ if (!list_empty(&dev->global_list)) continue; pci_bus_add_device(dev); } list_for_each_entry(dev, &bus->devices, bus_list) { BUG_ON(list_empty(&dev->global_list)); /* * If there is an unattached subordinate bus, attach * it and then scan for unattached PCI devices. */ if (dev->subordinate) { if (list_empty(&dev->subordinate->node)) { down_write(&pci_bus_sem); list_add_tail(&dev->subordinate->node, &dev->bus->children); up_write(&pci_bus_sem); } pci_bus_add_devices(dev->subordinate); sysfs_create_link(&dev->subordinate->class_dev.kobj, &dev->dev.kobj, "bridge"); } } } void pci_enable_bridges(struct pci_bus *bus) { struct pci_dev *dev; int retval; list_for_each_entry(dev, &bus->devices, bus_list) { if (dev->subordinate) { retval = pci_enable_device(dev); pci_set_master(dev); pci_enable_bridges(dev->subordinate); } } } /** pci_walk_bus - walk devices on/under bus, calling callback. * @top bus whose devices should be walked * @cb callback to be called for each device found * @userdata arbitrary pointer to be passed to callback. * * Walk the given bus, including any bridged devices * on buses under this bus. Call the provided callback * on each device found. */ void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *), void *userdata) { struct pci_dev *dev; struct pci_bus *bus; struct list_head *next; bus = top; down_read(&pci_bus_sem); next = top->devices.next; for (;;) { if (next == &bus->devices) { /* end of this bus, go up or finish */ if (bus == top) break; next = bus->self->bus_list.next; bus = bus->self->bus; continue; } dev = list_entry(next, struct pci_dev, bus_list); if (dev->subordinate) { /* this is a pci-pci bridge, do its devices next */ next = dev->subordinate->devices.next; bus = dev->subordinate; } else next = dev->bus_list.next; /* Run device routines with the device locked */ down(&dev->dev.sem); cb(dev, userdata); up(&dev->dev.sem); } up_read(&pci_bus_sem); } EXPORT_SYMBOL_GPL(pci_walk_bus); EXPORT_SYMBOL(pci_bus_alloc_resource); EXPORT_SYMBOL_GPL(pci_bus_add_device); EXPORT_SYMBOL(pci_bus_add_devices); EXPORT_SYMBOL(pci_enable_bridges);


context:
space:
mode: