lkml.org 
[lkml]   [2014]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] fs/9p/: don't treat error as status value in file locking
Date
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@oracle.com>
---
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


\
 
 \ /
  Last update: 2014-06-23 02:21    [W:0.059 / U:0.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site