fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-06 09:28:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/netlink: refactor handling length in validate_nla()

Browse source
This commit is contained in:
Thomas Haller 2021-08-10 17:14:04 +02:00
parent 6f1274caea
commit 68a5d1cfe5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libnm-platform/nm-netlink.c
View file

@ -598,6 +598,7 @@ validate_nla(const struct nlattr *nla, int maxtype, const struct nla_policy *pol
{
const struct nla_policy *pt;
uint16_t minlen;
uint16_t len;
int type = nla_type(nla);
if (type < 0 || type > maxtype)
@ -613,10 +614,12 @@ validate_nla(const struct nlattr *nla, int maxtype, const struct nla_policy *pol
else
minlen = nla_attr_minlen[pt->type];
if (nla_len(nla) < minlen)
len = nla_len(nla);
if (len < minlen)
return -NME_UNSPEC;
if (pt->maxlen && nla_len(nla) > pt->maxlen)
if (pt->maxlen && len > pt->maxlen)
return -NME_UNSPEC;
if (pt->type == NLA_STRING) {
@ -625,7 +628,7 @@ validate_nla(const struct nlattr *nla, int maxtype, const struct nla_policy *pol
nm_assert(minlen > 0);
data = nla_data(nla);
if (data[nla_len(nla) - 1] != '\0')
if (data[len - 1u] != '\0')
return -NME_UNSPEC;
}