]> git.karo-electronics.de Git - karo-tx-linux.git/commit
netlink: validate NLA_MSECS length
authorJohannes Berg <johannes.berg@intel.com>
Thu, 3 Nov 2011 00:07:32 +0000 (00:07 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 26 Nov 2011 17:10:33 +0000 (09:10 -0800)
commit7a0d6aef962b19ac2780bec718a852aa975db618
tree35de6e9419183ec6c3b559cee6c3123a6069896e
parentfb088f3ff1ba888aca715dd4b846cc9384431089
netlink: validate NLA_MSECS length

commit c30bc94758ae2a38a5eb31767c1985c0aae0950b upstream.

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>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
lib/nlattr.c