diff options
| author | David Howells | 2020-06-04 21:31:39 +0100 |
|---|---|---|
| committer | David Howells | 2020-06-09 15:22:06 +0100 |
| commit | 5749ce92c4b707353cbd934dd0518a1966d7988f (patch) | |
| tree | a5473fbf8e54509339008b9a45e2ea336fe7c494 /fs | |
| parent | 2ca068be09bf8e285036603823696140026dcbe7 (diff) | |
afs: Fix file locking
Fix AFS file locking to use the correct vnode pointer and remove a member
of the afs_operation struct that is never set, but it is read and followed,
causing an oops.
This can be triggered by:
flock -s /afs/example.com/foo sleep 1
when it calls the kernel to get a file lock.
Fixes: e49c7b2f6de7 ("afs: Build an abstraction around an "operation" concept")
Reported-by: Dave Botsch <botsch@cnf.cornell.edu>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Dave Botsch <botsch@cnf.cornell.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/afs/flock.c | 2 | ||||
| -rw-r--r-- | fs/afs/internal.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 70e518f7bc19..71eea2a908c7 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c @@ -71,7 +71,7 @@ static void afs_schedule_lock_extension(struct afs_vnode *vnode) void afs_lock_op_done(struct afs_call *call) { struct afs_operation *op = call->op; - struct afs_vnode *vnode = op->lock.lvnode; + struct afs_vnode *vnode = op->file[0].vnode; if (call->error == 0) { spin_lock(&vnode->lock); diff --git a/fs/afs/internal.h b/fs/afs/internal.h index e1621b0670cc..519ffb104616 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -795,7 +795,6 @@ struct afs_operation { struct afs_read *req; } fetch; struct { - struct afs_vnode *lvnode; /* vnode being locked */ afs_lock_type_t type; } lock; struct { |