mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-21 12:11:49 +08:00
ksmbd: free ppace array on error in parse_dacl
The ppace array is not freed if one of the init_acl_state() calls inside
parse_dacl() fails. At the moment the function may fail only due to the
memory allocation errors so it's highly unlikely in this case but
nevertheless a fix is needed.
Move ppace allocation after the init_acl_state() calls with proper error
handling.
Found by Linux Verification Center (linuxtesting.org).
Fixes: e2f34481b2
("cifsd: add server-side procedures for SMB3")
Cc: stable@vger.kernel.org
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
3fc74c65b3
commit
8cf9bedfc3
@ -401,10 +401,6 @@ static void parse_dacl(struct mnt_idmap *idmap,
|
||||
if (num_aces > ULONG_MAX / sizeof(struct smb_ace *))
|
||||
return;
|
||||
|
||||
ppace = kmalloc_array(num_aces, sizeof(struct smb_ace *), GFP_KERNEL);
|
||||
if (!ppace)
|
||||
return;
|
||||
|
||||
ret = init_acl_state(&acl_state, num_aces);
|
||||
if (ret)
|
||||
return;
|
||||
@ -414,6 +410,13 @@ static void parse_dacl(struct mnt_idmap *idmap,
|
||||
return;
|
||||
}
|
||||
|
||||
ppace = kmalloc_array(num_aces, sizeof(struct smb_ace *), GFP_KERNEL);
|
||||
if (!ppace) {
|
||||
free_acl_state(&default_acl_state);
|
||||
free_acl_state(&acl_state);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* reset rwx permissions for user/group/other.
|
||||
* Also, if num_aces is 0 i.e. DACL has no ACEs,
|
||||
|
Loading…
Reference in New Issue
Block a user