Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nfnetlink_cthelper: unbreak userspace helper support

Browse Source 
Restore helper data size initialization and fix memcopy of the helper
data size.

Fixes: 157ffffeb5 ("netfilter: nfnetlink_cthelper: reject too large userspace allocation requests")
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2020-05-24 21:04:42 +02:00
parent ee04805ff5
commit 703acd70f2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/netfilter/nfnetlink_cthelper.c
View File

@ -103,7 +103,7 @@ nfnl_cthelper_from_nlattr(struct nlattr *attr, struct nf_conn *ct)
if (help->helper->data_len == 0) if (help->helper->data_len == 0)
return -EINVAL; return -EINVAL;
nla_memcpy(help->data, nla_data(attr), sizeof(help->data)); nla_memcpy(help->data, attr, sizeof(help->data));
return 0; return 0;
} }
@ -240,6 +240,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[],
ret = -ENOMEM; ret = -ENOMEM;
goto err2; goto err2;
} }
helper->data_len = size;
helper->flags |= NF_CT_HELPER_F_USERSPACE; helper->flags |= NF_CT_HELPER_F_USERSPACE;
memcpy(&helper->tuple, tuple, sizeof(struct nf_conntrack_tuple)); memcpy(&helper->tuple, tuple, sizeof(struct nf_conntrack_tuple));