sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

ldap_server: chunk the writev() calls at 25MB

Browse Source 
This should limit the amount we send to GENSEC at a
time where it may help avoid large realloc or memcpy calls.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett
2019-05-14 12:08:03 +12:00
parent e8475f8ec5
commit 8dfad9fa2c
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source4/ldap_server/ldap_server.c
View File

@ -683,9 +683,16 @@ static void ldapsrv_call_writev_start(struct ldapsrv_call *call)
for (reply = call->replies; for (reply = call->replies;
reply != NULL; reply != NULL;
reply = reply->next) { reply = reply->next) {
/* Cap output at 25MB per writev() */
if (length > length + reply->blob.length
|| length + reply->blob.length > LDAP_SERVER_MAX_CHUNK_SIZE) {
break;
}
/* /*
* Overflow is harmless here, just used below to * Overflow is harmless here, just used below to
* decide if to read or write * decide if to read or write, but checkd above anyway
*/ */
length += reply->blob.length; length += reply->blob.length;

5
source4/ldap_server/ldap_server.h
View File

@ -100,6 +100,11 @@ struct ldapsrv_call {
*/ */
#define LDAP_SERVER_MAX_REPLY_SIZE ((size_t)(256 * 1024 * 1024)) #define LDAP_SERVER_MAX_REPLY_SIZE ((size_t)(256 * 1024 * 1024))
/*
* Start writing to the network before we hit this size
*/
#define LDAP_SERVER_MAX_CHUNK_SIZE ((size_t)(25 * 1024 * 1024))
struct ldapsrv_service { struct ldapsrv_service {
struct tstream_tls_params *tls_params; struct tstream_tls_params *tls_params;
struct task_server *task; struct task_server *task;