]> git.baikalelectronics.ru Git - kernel.git/commit
netlink: validate NLA_MSECS length
authorJohannes Berg <johannes.berg@intel.com>
Thu, 3 Nov 2011 00:07:32 +0000 (00:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Nov 2011 21:47:34 +0000 (17:47 -0400)
commitad2378c9b0ffff88b25e7c13e2c8d1c2472b3382
tree2b8e0565fe338a56cecc23ce299590c44e4438b6
parent1ccdb6f2d470a338f420cc07bbf85f1f9249c370
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>
lib/nlattr.c