summaryrefslogtreecommitdiff
path: root/lib/nlattr.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-03 00:07:32 +0000
committerDavid S. Miller <davem@davemloft.net>2011-11-04 17:47:34 -0400
commitc30bc94758ae2a38a5eb31767c1985c0aae0950b (patch)
tree2b8e0565fe338a56cecc23ce299590c44e4438b6 /lib/nlattr.c
parent433aee04a447fb2e769c4570f327d9c2a956117b (diff)
downloadlinux-3.10-c30bc94758ae2a38a5eb31767c1985c0aae0950b.tar.gz
linux-3.10-c30bc94758ae2a38a5eb31767c1985c0aae0950b.tar.bz2
linux-3.10-c30bc94758ae2a38a5eb31767c1985c0aae0950b.zip
netlink: validate NLA_MSECS length
L2TP for example uses NLA_MSECS like this: policy: [L2TP_ATTR_RECV_TIMEOUT] = { .type = NLA_MSECS, }, code: if (info->attrs[L2TP_ATTR_RECV_TIMEOUT]) cfg.reorder_timeout = nla_get_msecs(info->attrs[L2TP_ATTR_RECV_TIMEOUT]); As nla_get_msecs() is essentially nla_get_u64() plus the conversion to a HZ-based value, this will not properly reject attributes from userspace that aren't long enough and might overrun the message. Add NLA_MSECS to the attribute minlen array to check the size properly. Cc: Thomas Graf <tgraf@suug.ch> Cc: stable@vger.kernel.org Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/nlattr.c')
-rw-r--r--lib/nlattr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/nlattr.c b/lib/nlattr.c
index ac09f2226dc..a8408b6cacd 100644
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -20,6 +20,7 @@ static const u16 nla_attr_minlen[NLA_TYPE_MAX+1] = {
[NLA_U16] = sizeof(u16),
[NLA_U32] = sizeof(u32),
[NLA_U64] = sizeof(u64),
+ [NLA_MSECS] = sizeof(u64),
[NLA_NESTED] = NLA_HDRLEN,
};