/* * Copyright 2014 Google, Inc. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and * may be copied, distributed, and modified under those terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ #include #include #include #include #include #include "internal.h" static DEFINE_MUTEX(pmsg_lock); static ssize_t write_pmsg(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { u64 id; int ret; if (!count) return 0; /* check outside lock, page in any data. write_buf_user also checks */ if (!access_ok(VERIFY_READ, buf, count)) return -EFAULT; mutex_lock(&pmsg_lock); ret = psinfo->write_buf_user(PSTORE_TYPE_PMSG, 0, &id, 0, buf, 0, count, psinfo); mutex_unlock(&pmsg_lock); return ret ? ret : count; } static const struct file_operations pmsg_fops = { .owner = THIS_MODULE, .llseek = noop_llseek, .write = write_pmsg, }; static struct class *pmsg_class; static int pmsg_major; #define PMSG_NAME "pmsg" #undef pr_fmt #define pr_fmt(fmt) PMSG_NAME ": " fmt static char *pmsg_devnode(struct device *dev, umode_t *mode) { if (mode) *mode = 0220; return NULL; } void pstore_register_pmsg(void) { struct device *pmsg_device; pmsg_major = register_chrdev(0, PMSG_NAME, &pmsg_fops); if (pmsg_major < 0) { pr_err("register_chrdev failed\n"); goto err; } pmsg_class = class_create(THIS_MODULE, PMSG_NAME); if (IS_ERR(pmsg_class)) { pr_err("device class file already in use\n"); goto err_class; } pmsg_class->devnode = pmsg_devnode; pmsg_device = device_create(pmsg_class, NULL, MKDEV(pmsg_major, 0), NULL, "%s%d", PMSG_NAME, 0); if (IS_ERR(pmsg_device)) { pr_err("failed to create device\n"); goto err_device; } return; err_device: class_destroy(pmsg_class); err_class: unregister_chrdev(pmsg_major, PMSG_NAME); err: return; } void pstore_unregister_pmsg(void) { device_destroy(pmsg_class, MKDEV(pmsg_major, 0)); class_destroy(pmsg_class); unregister_chrdev(pmsg_major, PMSG_NAME); } ame='id' value='91539eb1fda2d530d3b268eef542c5414e54bf1a'/>
diff options
context:
space:
mode:
authorIago Abal <mail@iagoabal.eu>2017-01-11 14:00:21 +0100
committerVinod Koul <vinod.koul@intel.com>2017-01-25 15:35:11 +0530
commit91539eb1fda2d530d3b268eef542c5414e54bf1a (patch)
tree960f5ca6342ad20837aff18aad6e8ecd7da32fd6 /sound/soc/intel/boards/broadwell.c
parent6610d0edf6dc7ee97e46ab3a538a565c79d26199 (diff)
dmaengine: pl330: fix double lock
The static bug finder EBA (http://www.iagoabal.eu/eba/) reported the following double-lock bug: Double lock: 1. spin_lock_irqsave(pch->lock, flags) at pl330_free_chan_resources:2236; 2. call to function `pl330_release_channel' immediately after; 3. call to function `dma_pl330_rqcb' in line 1753; 4. spin_lock_irqsave(pch->lock, flags) at dma_pl330_rqcb:1505. I have fixed it as suggested by Marek Szyprowski. First, I have replaced `pch->lock' with `pl330->lock' in functions `pl330_alloc_chan_resources' and `pl330_free_chan_resources'. This avoids the double-lock by acquiring a different lock than `dma_pl330_rqcb'. NOTE that, as a result, `pl330_free_chan_resources' executes `list_splice_tail_init' on `pch->work_list' under lock `pl330->lock', whereas in the rest of the code `pch->work_list' is protected by `pch->lock'. I don't know if this may cause race conditions. Similarly `pch->cyclic' is written by `pl330_alloc_chan_resources' under `pl330->lock' but read by `pl330_tx_submit' under `pch->lock'. Second, I have removed locking from `pl330_request_channel' and `pl330_release_channel' functions. Function `pl330_request_channel' is only called from `pl330_alloc_chan_resources', so the lock is already held. Function `pl330_release_channel' is called from `pl330_free_chan_resources', which already holds the lock, and from `pl330_del'. Function `pl330_del' is called in an error path of `pl330_probe' and at the end of `pl330_remove', but I assume that there cannot be concurrent accesses to the protected data at those points. Signed-off-by: Iago Abal <mail@iagoabal.eu> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'sound/soc/intel/boards/broadwell.c')