[PATCH] fs/9p/: don't treat error as status value in file locking

From: Sasha Levin
Date: Sun Jun 22 2014 - 19:45:27 EST


When trying to lock a file we didn't properly handle the case where a
failure in p9_client_lock_dotl() occurs and treated the status value
as valid instead of discarding it due to the error.

This would usually trigger a BUG() since the status value would
just be stack garbage.

Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
---
fs/9p/vfs_file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 520c11c..06077f3 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -194,7 +194,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
for (;;) {
res = p9_client_lock_dotl(fid, &flock, &status);
if (res < 0)
- break;
+ return res;

if (status != P9_LOCK_BLOCKED)
break;
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/