UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fsi: sbefifo: Fix inconsistent use of ffdc mutex 

Some of the exit path missed the unlock. Move the mutex to
an outer function to avoid the problem completely

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2018-07-23 16:27:21 +10:00
parent 6a794a27da
commit 4fcdc2d1b0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/fsi/fsi-sbefifo.c
View File

@ -136,16 +136,14 @@ struct sbefifo_user {
static DEFINE_IDA(sbefifo_ida); static DEFINE_IDA(sbefifo_ida);
static DEFINE_MUTEX(sbefifo_ffdc_mutex); static DEFINE_MUTEX(sbefifo_ffdc_mutex);
static void __sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc, size_t ffdc_sz, bool internal)
size_t ffdc_sz, bool internal)
{ {
int pack = 0; int pack = 0;
#define FFDC_LSIZE 60 #define FFDC_LSIZE 60
static char ffdc_line[FFDC_LSIZE]; static char ffdc_line[FFDC_LSIZE];
char *p = ffdc_line; char *p = ffdc_line;
mutex_lock(&sbefifo_ffdc_mutex);
while (ffdc_sz) { while (ffdc_sz) {
u32 w0, w1, w2, i; u32 w0, w1, w2, i;
if (ffdc_sz < 3) { if (ffdc_sz < 3) {
@ -194,6 +192,13 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
} }
dev_warn(dev, "+-------------------------------------------+\n"); dev_warn(dev, "+-------------------------------------------+\n");
} }
}
static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
size_t ffdc_sz, bool internal)
{
mutex_lock(&sbefifo_ffdc_mutex);
__sbefifo_dump_ffdc(dev, ffdc, ffdc_sz, internal);
mutex_unlock(&sbefifo_ffdc_mutex); mutex_unlock(&sbefifo_ffdc_mutex);
} }