mnl: do not cache sender buffer size
Pablo Neira Ayuso
maintainerPATCH 1/1 mnl: do not cache sender buffer size
SO_SNDBUF never fails, this socket option just provides a hint to the kernel. SO_SNDBUFFORCE sets the buffer size to zero if the value goes over INT_MAX. Userspace is caching the buffer hint that sends to the kernel, so it might leave userspace out of sync if the kernel ignores the hint. Do not make assumptions, fetch the sender buffer size from the kernel via getsockopt().
--- src/mnl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
src/mnl.c +6 -6
@@ -218,24 +218,24 @@ void mnl_err_list_free(struct mnl_err *err)xfree (err); } -static int nlbuffsiz; -static void mnl_set_sndbuffer (const struct mnl_socket *nl,struct nftnl_batch *batch) { +int sndnlbuffsiz =0 ;int newbuffsiz; +socklen_t len; -if (nftnl_batch_iovec_len (batch) *BATCH_PAGE_SIZE <= nlbuffsiz) -return ; +getsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_SNDBUF , + &sndnlbuffsiz, &len); newbuffsiz =nftnl_batch_iovec_len (batch) *BATCH_PAGE_SIZE ; +if (newbuffsiz <= sndnlbuffsiz) +return ;/* Rise sender buffer length to avoid hitting -EMSGSIZE */ if (setsockopt (mnl_socket_get_fd (nl),SOL_SOCKET ,SO_SNDBUFFORCE , &newbuffsiz,sizeof (socklen_t)) <0 )return ; - - nlbuffsiz = newbuffsiz; }static unsigned int nlsndbufsiz;
Signature · 1 line
2.11.0
Florian Westphal
maintainerQuoted 18 lines · Pablo Neira Ayuso
SO_SNDBUFnever fails, this socket option just provides a hint to the kernel.SO_SNDBUFFORCEsets the buffer size to zero if the value goes overINT_MAX. Userspace is caching the buffer hint that sends to the kernel, so it might leave userspace out of sync if the kernel ignores the hint. Do not make assumptions, fetch the sender buffer size from the kernel viagetsockopt().Signed-off-by Pablo Neira Ayuso <[email protected]>--- src/mnl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)src/mnl.c +0
-0@@ -218,24 +218,24 @@ void mnl_err_list_free(struct mnl_err *err)xfree (err);
src/mnl.c void mnl_err_list_free(struct mnl_err *err) · line 226
Quoted 10 lines
src/mnl.c +2
-2} -static int nlbuffsiz; -static void mnl_set_sndbuffer (const struct mnl_socket *nl,struct nftnl_batch *batch) { +int sndnlbuffsiz =0 ;int newbuffsiz; +socklen_t len;
IIRC this needs to be
len = sizeof(sndnlbuffsiz);