Commit c30bc947 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

netlink: validate NLA_MSECS length

L2TP for example uses NLA_MSECS like this:
        [L2TP_ATTR_RECV_TIMEOUT]        = { .type = NLA_MSECS, },
        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 <>
Signed-off-by: default avatarJohannes Berg <>
Signed-off-by: default avatarDavid S. Miller <>
parent 433aee04
......@@ -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),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment