status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

the buffer passed to mnl_nlmsg_batch_start() must be double of MNL_SOCKET_BUFFER_SIZE 

see https://www.netfilter.org/projects/libmnl/doxygen/html/group__batch.html
http://www.lt.netfilter.org/projects/libmnl/doxygen/group__batch.html#ga28488fc4dee4c3e9eda5918f049db2af
This commit is contained in:
Thomas Bernard 2020-06-02 00:07:39 +02:00
parent 5dbdc50aa7
commit 7b9489fb84
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -1133,10 +1133,9 @@ nft_send_rule(struct nftnl_rule * rule, uint16_t cmd, enum rule_chain_type chain
int result = -1; int result = -1;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct mnl_nlmsg_batch *batch; struct mnl_nlmsg_batch *batch;
char buf[MNL_SOCKET_BUFFER_SIZE]; char buf[MNL_SOCKET_BUFFER_SIZE*2];
batch = start_batch(buf, MNL_SOCKET_BUFFER_SIZE);
batch = start_batch(buf, sizeof(buf));
if (batch != NULL) if (batch != NULL)
{ {
switch (chain_type) { switch (chain_type) {
@ -1171,7 +1170,7 @@ table_op( enum nf_tables_msg_types op, uint16_t family, const char * name)
int result; int result;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct mnl_nlmsg_batch *batch; struct mnl_nlmsg_batch *batch;
char buf[MNL_SOCKET_BUFFER_SIZE]; char buf[MNL_SOCKET_BUFFER_SIZE*2];
struct nftnl_table *table; struct nftnl_table *table;
@ -1185,7 +1184,7 @@ table_op( enum nf_tables_msg_types op, uint16_t family, const char * name)
nftnl_table_set_u32(table, NFTNL_TABLE_FAMILY, family); nftnl_table_set_u32(table, NFTNL_TABLE_FAMILY, family);
nftnl_table_set_str(table, NFTNL_TABLE_NAME, name); nftnl_table_set_str(table, NFTNL_TABLE_NAME, name);
batch = start_batch( buf, sizeof(buf)); batch = start_batch(buf, MNL_SOCKET_BUFFER_SIZE);
if (batch == NULL) { if (batch == NULL) {
log_error("out of memory: %m"); log_error("out of memory: %m");
result = -2; result = -2;
@ -1210,7 +1209,7 @@ chain_op(enum nf_tables_msg_types op, uint16_t family, const char * table,
int result = -1; int result = -1;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct mnl_nlmsg_batch *batch; struct mnl_nlmsg_batch *batch;
char buf[MNL_SOCKET_BUFFER_SIZE]; char buf[MNL_SOCKET_BUFFER_SIZE*2];
struct nftnl_chain *chain; struct nftnl_chain *chain;
@ -1230,7 +1229,7 @@ chain_op(enum nf_tables_msg_types op, uint16_t family, const char * table,
nftnl_chain_set_s32(chain, NFTNL_CHAIN_PRIO, priority); nftnl_chain_set_s32(chain, NFTNL_CHAIN_PRIO, priority);
} }
batch = start_batch(buf, sizeof(buf)); batch = start_batch(buf, MNL_SOCKET_BUFFER_SIZE);
if (batch == NULL) { if (batch == NULL) {
log_error("out of memory: %m"); log_error("out of memory: %m");
result = -3; result = -3;
@ -1254,9 +1253,13 @@ chain_op(enum nf_tables_msg_types op, uint16_t family, const char * table,
return result; return result;
} }
/**
* the buffer that you have to use to store the batch must be double
* of MNL_SOCKET_BUFFER_SIZE
* @see https://www.netfilter.org/projects/libmnl/doxygen/html/group__batch.html
*/
struct mnl_nlmsg_batch * struct mnl_nlmsg_batch *
start_batch( char *buf, size_t buf_size) start_batch(char *buf, size_t buf_size)
{ {
struct mnl_nlmsg_batch *result; struct mnl_nlmsg_batch *result;
mnl_seq = time(NULL); mnl_seq = time(NULL);