cris: fix locking in pcf8563.c
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 cris: fix locking in pcf8563.c
The ioctl function was incorrectly converted to unlocked_ioctl, this fixes the locking.
---
Quoted 21 lines · Michael Brumlow
I was looking through some code and found an issue in the driver you wrote. The problem can be found in "
arch/cris/arch-v10/drivers/pcf8563.c" function "pcf8563_unlocked_ioctl". The function locks a mutex and returns, when it should be locking the locking the mutex, storing the return from the function called and then unlocking the mutex and finally returning the stored value of the function called.# in its current state. 343 static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 344 { 345 int ret; 346 347 mutex_lock(&pcf8563_mutex); 348 return pcf8563_ioctl(filp, cmd, arg); 349 mutex_unlock(&pcf8563_mutex); 350 351 return ret; 352 }
Quoted 12 lines
# what is suggested.
343 static long pcf8563_unlocked_ioctl(struct file *filp, unsigned
int cmd, unsigned long arg)
344 {
345 int ret;
346
347 mutex_lock(&pcf8563_mutex);
348 ret = pcf8563_ioctl(filp, cmd, arg);
349 mutex_unlock(&pcf8563_mutex);
350
351 return ret;
352 }You are right. This problem exists in both arch/cris/arch-v10/drivers/pcf8563.c and arch/cris/arch-v32/drivers/pcf8563.c, and apparently both are my fault.
Arnd
---
arch/cris/arch-v10/drivers/pcf8563.c +1 -1
@@ -345,7 +345,7 @@ static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsignedint ret;mutex_lock (&pcf8563_mutex); -return pcf8563_ioctl (filp, cmd, arg); + ret =pcf8563_ioctl (filp, cmd, arg);mutex_unlock (&pcf8563_mutex);return ret;
arch/cris/arch-v32/drivers/pcf8563.c +1 -1
@@ -341,7 +341,7 @@ static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsignedint ret;mutex_lock (&pcf8563_mutex); -return pcf8563_ioctl (filp, cmd, arg); + ret =pcf8563_ioctl (filp, cmd, arg);mutex_unlock (&pcf8563_mutex);return ret;