]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - lib/nlattr.c
netlink: don't compare the nul-termination in nla_strcmp
authorPablo Neira <pablo@netfilter.org>
Tue, 1 Apr 2014 17:38:44 +0000 (19:38 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Apr 2014 19:25:02 +0000 (15:25 -0400)
commit8b7b932434f5eee495b91a2804f5b64ebb2bc835
tree41fa7d3804b0a2f1e4c1ad252f6062ed17e83251
parentff378ca17cf34cac0bb288f50999858101d5fd55
netlink: don't compare the nul-termination in nla_strcmp

nla_strcmp compares the string length plus one, so it's implicitly
including the nul-termination in the comparison.

 int nla_strcmp(const struct nlattr *nla, const char *str)
 {
        int len = strlen(str) + 1;
        ...
                d = memcmp(nla_data(nla), str, len);

However, if NLA_STRING is used, userspace can send us a string without
the nul-termination. This is a problem since the string
comparison will not match as the last byte may be not the
nul-termination.

Fix this by skipping the comparison of the nul-termination if the
attribute data is nul-terminated. Suggested by Thomas Graf.

Cc: Florian Westphal <fw@strlen.de>
Cc: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
lib/nlattr.c