Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-2
+1
fs/smb/server/misc.c
+1
fs/smb/server/misc.c
···
261
261
262
262
/**
263
263
* ksmbd_extract_sharename() - get share name from tree connect request
264
+
* @um: pointer to a unicode_map structure for character encoding handling
264
265
* @treename: buffer containing tree name and share name
265
266
*
266
267
* Return: share name on success, otherwise error
+6
-2
fs/smb/server/smb2pdu.c
+6
-2
fs/smb/server/smb2pdu.c
···
6173
6173
err = ksmbd_iov_pin_rsp_read(work, (void *)rsp,
6174
6174
offsetof(struct smb2_read_rsp, Buffer),
6175
6175
aux_payload_buf, nbytes);
6176
-
if (err)
6176
+
if (err) {
6177
+
kvfree(aux_payload_buf);
6177
6178
goto out;
6179
+
}
6178
6180
kvfree(rpc_resp);
6179
6181
} else {
6180
6182
err = ksmbd_iov_pin_rsp(work, (void *)rsp,
···
6386
6384
err = ksmbd_iov_pin_rsp_read(work, (void *)rsp,
6387
6385
offsetof(struct smb2_read_rsp, Buffer),
6388
6386
aux_payload_buf, nbytes);
6389
-
if (err)
6387
+
if (err) {
6388
+
kvfree(aux_payload_buf);
6390
6389
goto out;
6390
+
}
6391
6391
ksmbd_fd_put(work, fp);
6392
6392
return 0;
6393
6393