]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
NLM: Defend against file_lock changes after vfs_test_lock()
authorBenjamin Coddington <bcodding@redhat.com>
Mon, 13 Jun 2022 13:40:06 +0000 (09:40 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Sat, 30 Jul 2022 00:08:56 +0000 (20:08 -0400)
commit184cefbe62627730c30282df12bcff9aae4816ea
tree5c26908a40480fae4d402c57ef1720dadf1e6532
parentc770f31d8f580ed4b965c64f924ec1cc50e41734
NLM: Defend against file_lock changes after vfs_test_lock()

Instead of trusting that struct file_lock returns completely unchanged
after vfs_test_lock() when there's no conflicting lock, stash away our
nlm_lockowner reference so we can properly release it for all cases.

This defends against another file_lock implementation overwriting fl_owner
when the return type is F_UNLCK.

Reported-by: Roberto Bergantinos Corpas <rbergant@redhat.com>
Tested-by: Roberto Bergantinos Corpas <rbergant@redhat.com>
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/lockd/svc4proc.c
fs/lockd/svclock.c
fs/lockd/svcproc.c
include/linux/lockd/lockd.h