mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ksmbd: fix unused err value in smb2_lock
CID 1502845 (#1 of 1): Unused value (UNUSED_VALUE) value_overwrite: Overwriting previous write to err with value from vfs_lock_file(filp, 0U, rlock, NULL). 6880 err = vfs_lock_file(filp, 0, rlock, NULL); 6881 if (err) 6882 pr_err("rollback unlock fail : %d\n", err); Reported-by: Coverity Scan <scan-admin@coverity.com> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
78ad2c277a
commit
96ad4ec51c
1 changed files with 6 additions and 5 deletions
|
@ -6835,7 +6835,7 @@ int smb2_lock(struct ksmbd_work *work)
|
|||
rsp->Reserved = 0;
|
||||
inc_rfc1001_len(rsp, 4);
|
||||
ksmbd_fd_put(work, fp);
|
||||
return err;
|
||||
return 0;
|
||||
|
||||
out:
|
||||
list_for_each_entry_safe(smb_lock, tmp, &lock_list, llist) {
|
||||
|
@ -6846,15 +6846,16 @@ int smb2_lock(struct ksmbd_work *work)
|
|||
|
||||
list_for_each_entry_safe(smb_lock, tmp, &rollback_list, llist) {
|
||||
struct file_lock *rlock = NULL;
|
||||
int rc;
|
||||
|
||||
rlock = smb_flock_init(filp);
|
||||
rlock->fl_type = F_UNLCK;
|
||||
rlock->fl_start = smb_lock->start;
|
||||
rlock->fl_end = smb_lock->end;
|
||||
|
||||
err = vfs_lock_file(filp, 0, rlock, NULL);
|
||||
if (err)
|
||||
pr_err("rollback unlock fail : %d\n", err);
|
||||
rc = vfs_lock_file(filp, 0, rlock, NULL);
|
||||
if (rc)
|
||||
pr_err("rollback unlock fail : %d\n", rc);
|
||||
|
||||
list_del(&smb_lock->llist);
|
||||
spin_lock(&work->conn->llist_lock);
|
||||
|
@ -6871,7 +6872,7 @@ int smb2_lock(struct ksmbd_work *work)
|
|||
ksmbd_debug(SMB, "failed in taking lock(flags : %x)\n", flags);
|
||||
smb2_set_err_rsp(work);
|
||||
ksmbd_fd_put(work, fp);
|
||||
return 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
static int fsctl_copychunk(struct ksmbd_work *work, struct smb2_ioctl_req *req,
|
||||
|
|
Loading…
Reference in a new issue