Commit fb005c47 authored Jan 15, 2015 by Linus Torvalds

linux

Pull file locking fix from Jeff Layton:
 "Just a simple bugfix for a regression that I introduced into v3.18
  with the internal lease API overhaul -- mea culpa.  Kudos to Linda and
  Neil for tracking this down and fixing it"

* tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux:
  locks: fix NULL-deref in generic_delete_lease

parents 31238e61 52d304eb

fs/locks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1702,7 +1702,7 @@ static int generic_delete_lease(struct file *filp)
		break;
		}
		trace_generic_delete_lease(inode, fl);
		if (fl)
		if (fl && IS_LEASE(fl))
		error = fl->fl_lmops->lm_change(before, F_UNLCK, &dispose);
		spin_unlock(&inode->i_lock);
		locks_dispose_list(&dispose);