Skip to content

Commit 5a7ec87

Browse files
committed
Merge tag '6.8-rc3-ksmbd-server-fixes' of git://git.samba.org/ksmbd
Pull smb server fixes from Steve French: "Two ksmbd server fixes: - memory leak fix - a minor kernel-doc fix" * tag '6.8-rc3-ksmbd-server-fixes' of git://git.samba.org/ksmbd: ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails ksmbd: Add kernel-doc for ksmbd_extract_sharename() function
2 parents 4a7bbe7 + 108a020 commit 5a7ec87

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

fs/smb/server/misc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ char *ksmbd_casefold_sharename(struct unicode_map *um, const char *name)
261261

262262
/**
263263
* ksmbd_extract_sharename() - get share name from tree connect request
264+
* @um: pointer to a unicode_map structure for character encoding handling
264265
* @treename: buffer containing tree name and share name
265266
*
266267
* Return: share name on success, otherwise error

fs/smb/server/smb2pdu.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6173,8 +6173,10 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work)
61736173
err = ksmbd_iov_pin_rsp_read(work, (void *)rsp,
61746174
offsetof(struct smb2_read_rsp, Buffer),
61756175
aux_payload_buf, nbytes);
6176-
if (err)
6176+
if (err) {
6177+
kvfree(aux_payload_buf);
61776178
goto out;
6179+
}
61786180
kvfree(rpc_resp);
61796181
} else {
61806182
err = ksmbd_iov_pin_rsp(work, (void *)rsp,
@@ -6384,8 +6386,10 @@ int smb2_read(struct ksmbd_work *work)
63846386
err = ksmbd_iov_pin_rsp_read(work, (void *)rsp,
63856387
offsetof(struct smb2_read_rsp, Buffer),
63866388
aux_payload_buf, nbytes);
6387-
if (err)
6389+
if (err) {
6390+
kvfree(aux_payload_buf);
63886391
goto out;
6392+
}
63896393
ksmbd_fd_put(work, fp);
63906394
return 0;
63916395

0 commit comments

Comments
 (0)