vfs: fix handling of lock allocation failure in lease-break case
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Dec 2011 18:25:26 +0000 (10:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Dec 2011 18:25:26 +0000 (10:25 -0800)
commit6d4b9e38d3980826abccfbd90e95bf4bd41b8dd2
tree7473e333fc5aae6dd1d4b7f86205a330818518ce
parent4962516b2309d76964f9df0d33e74f43b624a42d
vfs: fix handling of lock allocation failure in lease-break case

Bruce Fields notes that commit 778fc546f749 ("locks: fix tracking of
inprogress lease breaks") introduced a possible error pointer
dereference on failure to allocate memory.  locks_conflict() will
dereference the passed-in new lease lock structure that may be an error pointer.

This means an open (without O_NONBLOCK set) on a file with a lease
applied (generally only done when Samba or nfsd (with v4) is running)
could crash if a kmalloc() fails.

So instead of playing games with IS_ERROR() all over the place, just
check the allocation failure early.  That makes the code more
straightforward, and avoids this possible bad pointer dereference.

Based-on-patch-by: J. Bruce Fields <bfields@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/locks.c