diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-11-28 12:05:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-28 12:05:19 +0100 |
| commit | ea5693ccc553951ae44cb963b28cce85edc275c9 (patch) | |
| tree | 44ca6da57e63035537d01cf58c24837067c2ec26 /net/netlink | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| download | linux-ea5693ccc553951ae44cb963b28cce85edc275c9.tar.xz linux-ea5693ccc553951ae44cb963b28cce85edc275c9.zip | |
netlink: allow empty nested attributes
validate_nla() currently doesn't allow empty nested attributes. This
makes userspace code unnecessarily complicated when starting and ending
the nested attribute is done by generic upper level code and the inner
attributes are dumped by a module.
Add a special case to accept empty nested attributes. When the nested
attribute is non empty, the same checks as before are performed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/attr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netlink/attr.c b/net/netlink/attr.c index c83fea7da9a8..56c3ce7fe29a 100644 --- a/net/netlink/attr.c +++ b/net/netlink/attr.c @@ -83,6 +83,12 @@ static int validate_nla(struct nlattr *nla, int maxtype, if (attrlen < NLA_ALIGN(pt->len) + NLA_HDRLEN + nla_len(nla)) return -ERANGE; break; + case NLA_NESTED: + /* a nested attributes is allowed to be empty; if its not, + * it must have a size of at least NLA_HDRLEN. + */ + if (attrlen == 0) + break; default: if (pt->len) minlen = pt->len; |