UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ksmbd: Fix resource leak in smb2_lock() 

"flock" is leaked if an error happens before smb2_lock_init(), as the
lock is not added to the lock_list to be cleaned up.

Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Marios Makassikis 2022-11-29 12:19:33 +01:00 committed by Steve French
parent bc044414fa
commit 01f6c61bae
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ksmbd/smb2pdu.c
View File

@ -6857,6 +6857,7 @@ int smb2_lock(struct ksmbd_work *work)
if (lock_start > U64_MAX - lock_length) { if (lock_start > U64_MAX - lock_length) {
pr_err("Invalid lock range requested\n"); pr_err("Invalid lock range requested\n");
rsp->hdr.Status = STATUS_INVALID_LOCK_RANGE; rsp->hdr.Status = STATUS_INVALID_LOCK_RANGE;
locks_free_lock(flock);
goto out; goto out;
} }
@ -6876,6 +6877,7 @@ int smb2_lock(struct ksmbd_work *work)
"the end offset(%llx) is smaller than the start offset(%llx)\n", "the end offset(%llx) is smaller than the start offset(%llx)\n",
flock->fl_end, flock->fl_start); flock->fl_end, flock->fl_start);
rsp->hdr.Status = STATUS_INVALID_LOCK_RANGE; rsp->hdr.Status = STATUS_INVALID_LOCK_RANGE;
locks_free_lock(flock);
goto out; goto out;
} }
@ -6887,6 +6889,7 @@ int smb2_lock(struct ksmbd_work *work)
flock->fl_type != F_UNLCK) { flock->fl_type != F_UNLCK) {
pr_err("conflict two locks in one request\n"); pr_err("conflict two locks in one request\n");
err = -EINVAL; err = -EINVAL;
locks_free_lock(flock);
goto out; goto out;
} }
} }
@ -6895,6 +6898,7 @@ int smb2_lock(struct ksmbd_work *work)
smb_lock = smb2_lock_init(flock, cmd, flags, &lock_list); smb_lock = smb2_lock_init(flock, cmd, flags, &lock_list);
if (!smb_lock) { if (!smb_lock) {
err = -EINVAL; err = -EINVAL;
locks_free_lock(flock);
goto out; goto out;
} }
} }