xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

afs: Fix file locking

Browse Source 
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: e49c7b2f6d ("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>
This commit is contained in:
David Howells
2020-06-04 21:31:39 +01:00
parent 2ca068be09
commit 5749ce92c4
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/afs/flock.c
View File

@@ -71,7 +71,7 @@ static void afs_schedule_lock_extension(struct afs_vnode *vnode)
void afs_lock_op_done(struct afs_call *call) void afs_lock_op_done(struct afs_call *call)
{ {
struct afs_operation *op = call->op; 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) { if (call->error == 0) {
spin_lock(&vnode->lock); spin_lock(&vnode->lock);

1
fs/afs/internal.h
View File

@@ -795,7 +795,6 @@ struct afs_operation {
struct afs_read *req; struct afs_read *req;
} fetch; } fetch;
struct { struct {
struct afs_vnode *lvnode; /* vnode being locked */
afs_lock_type_t type; afs_lock_type_t type;
} lock; } lock;
struct { struct {