system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 19:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform/netlink: merge branch 'th/netlink-policy-cleanup'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/959
This commit is contained in:
Thomas Haller 2021-08-17 13:22:12 +02:00
parent b57c1af814 76bcd78710
commit 5d0d8f9e3a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 39 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libnm-platform/nm-linux-platform.c
View file

@ -2305,7 +2305,7 @@ _wireguard_get_device_cb(struct nl_msg *msg, void *arg)
{
static const struct nla_policy policy[] = {
[WGDEVICE_A_IFINDEX] = {.type = NLA_U32},
[WGDEVICE_A_IFNAME] = {.type = NLA_NUL_STRING, .maxlen = IFNAMSIZ},
[WGDEVICE_A_IFNAME] = {.type = NLA_STRING, .maxlen = IFNAMSIZ},
[WGDEVICE_A_PRIVATE_KEY] = {},
[WGDEVICE_A_PUBLIC_KEY] = {},
[WGDEVICE_A_FLAGS] = {.type = NLA_U32},

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

@ -585,21 +585,21 @@ nla_nest_end(struct nl_msg *msg, struct nlattr *start)
return _nest_end(msg, start, 0);
}
static const uint16_t nla_attr_minlen[NLA_TYPE_MAX + 1] = {
static const uint8_t nla_attr_minlen[NLA_TYPE_MAX + 1] = {
[NLA_U8] = sizeof(uint8_t),
[NLA_U16] = sizeof(uint16_t),
[NLA_U32] = sizeof(uint32_t),
[NLA_U64] = sizeof(uint64_t),
[NLA_STRING] = 1,
[NLA_FLAG] = 0,
};
static int
validate_nla(const struct nlattr *nla, int maxtype, const struct nla_policy *policy)
{
const struct nla_policy *pt;
unsigned int minlen = 0;
int type = nla_type(nla);
uint8_t minlen;
uint16_t len;
int type = nla_type(nla);
if (type < 0 || type > maxtype)
return 0;
@ -609,25 +609,30 @@ validate_nla(const struct nlattr *nla, int maxtype, const struct nla_policy *pol
if (pt->type > NLA_TYPE_MAX)
g_return_val_if_reached(-NME_BUG);
if (pt->minlen)
if (pt->minlen > 0)
minlen = pt->minlen;
else if (pt->type != NLA_UNSPEC)
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 > 0 && len > pt->maxlen)
return -NME_UNSPEC;
if (pt->type == NLA_STRING) {
const char *data;
switch (pt->type) {
case NLA_STRING:
{
const char *data = nla_data(nla);
nm_assert(minlen > 0);
data = nla_data(nla);
if (data[nla_len(nla) - 1] != '\0')
if (data[len - 1u] != '\0')
return -NME_UNSPEC;
break;
}
}
return 0;

50
src/libnm-platform/nm-netlink.h
View file

@ -35,15 +35,7 @@ enum {
NLA_U64, /* 64 bit integer */
NLA_STRING, /* NUL terminated character string */
NLA_FLAG, /* Flag */
NLA_MSECS, /* Micro seconds (64bit) */
NLA_NESTED, /* Nested attributes */
NLA_NESTED_COMPAT,
NLA_NUL_STRING,
NLA_BINARY,
NLA_S8,
NLA_S16,
NLA_S32,
NLA_S64,
__NLA_TYPE_MAX,
};
@ -63,10 +55,10 @@ const char *nl_nlmsghdr_to_str(const struct nlmsghdr *hdr, char *buf, gsize len)
struct nla_policy {
/* Type of attribute or NLA_UNSPEC */
uint16_t type;
uint8_t type;
/* Minimal length of payload required */
uint16_t minlen;
uint8_t minlen;
/* Maximal length of payload allowed */
uint16_t maxlen;
@ -75,18 +67,24 @@ struct nla_policy {
/*****************************************************************************/
/* static asserts that @tb and @policy are suitable arguments to nla_parse(). */
#define _nl_static_assert_tb(tb, policy) \
G_STMT_START \
{ \
G_STATIC_ASSERT_EXPR(G_N_ELEMENTS(tb) > 0); \
\
#if _NM_CC_SUPPORT_GENERIC
#define _nl_static_assert_tb(tb, policy) \
G_STMT_START \
{ \
G_STATIC_ASSERT_EXPR(G_N_ELEMENTS(tb) > 0); \
\
/* We allow @policy to be either a C array or NULL. The sizeof()
* must either match the expected array size or the sizeof(NULL),
* but not both. */ \
G_STATIC_ASSERT_EXPR((sizeof(policy) == G_N_ELEMENTS(tb) * sizeof(struct nla_policy)) \
^ (sizeof(policy) == sizeof(NULL))); \
} \
* must either match the expected array size or we check that
* "policy" has typeof(NULL). This isn't a perfect compile time check,
* but good enough. */ \
G_STATIC_ASSERT_EXPR( \
_Generic((policy), typeof(NULL) : 1, default \
: (sizeof(policy) == G_N_ELEMENTS(tb) * sizeof(struct nla_policy)))); \
} \
G_STMT_END
#else
#define _nl_static_assert_tb(tb, policy) G_STATIC_ASSERT_EXPR(G_N_ELEMENTS(tb) > 0)
#endif
/*****************************************************************************/
@ -112,28 +110,24 @@ nla_padlen(int payload)
struct nlattr *nla_reserve(struct nl_msg *msg, int attrtype, int attrlen);
static inline int
static inline uint16_t
nla_len(const struct nlattr *nla)
{
nm_assert(nla);
nm_assert(nla->nla_len >= NLA_HDRLEN);
return ((int) nla->nla_len) - NLA_HDRLEN;
return nla->nla_len - ((uint16_t) NLA_HDRLEN);
}
static inline int
nla_type(const struct nlattr *nla)
{
nm_assert(nla_len(nla) >= 0);
return nla->nla_type & NLA_TYPE_MASK;
}
static inline void *
nla_data(const struct nlattr *nla)
{
nm_assert(nla_len(nla) >= 0);
return &(((char *) nla)[NLA_HDRLEN]);
}
@ -219,9 +213,7 @@ nla_get_be64(const struct nlattr *nla)
static inline char *
nla_get_string(const struct nlattr *nla)
{
nm_assert(nla_len(nla) >= 0);
return (char *) nla_data(nla);
return nla_data(nla);
}
size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize);