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

Commit f39b913c authored by Jeff Layton's avatar Jeff Layton
Browse files

locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease



The argument to locks_unlink_lock can't be just any pointer to a
pointer. It must be a pointer to the fl_next field in the previous
lock in the list.

Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 66f09ca7
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1619,7 +1619,7 @@ static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp
	smp_mb();
	smp_mb();
	error = check_conflicting_open(dentry, arg);
	error = check_conflicting_open(dentry, arg);
	if (error)
	if (error)
		locks_unlink_lock(flp);
		locks_unlink_lock(before);
out:
out:
	if (is_deleg)
	if (is_deleg)
		mutex_unlock(&inode->i_mutex);
		mutex_unlock(&inode->i_mutex);