Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad80492d authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Eric Van Hensbergen
Browse files

9p: fix error handling in v9fs_file_do_lock 



p9_client_lock_dotl() doesn't set status if p9_client_rpc() fails.
It can lead to 'default:' case in switch below and kernel crashes.

Let's bypass the switch if p9_client_lock_dotl() fails.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarDominique Martinet <dominique.martinet@cea.fr>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 9bfc52c1

fs/9p/vfs_file.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

			goto out_unlock;



		if (status != P9_LOCK_BLOCKED)

			break;
@@ -220,6 +220,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl) 
		BUG();

	}



out_unlock:

	/*

	 * incase server returned error for lock request, revert

	 * it locally