]> Pileus Git - ~andy/linux/commitdiff
rtnetlink: Mask the rta_type when range checking
authorVlad Yasevich <vyasevic@redhat.com>
Wed, 13 Mar 2013 04:18:58 +0000 (04:18 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 Mar 2013 15:43:40 +0000 (11:43 -0400)
Range/validity checks on rta_type in rtnetlink_rcv_msg() do
not account for flags that may be set.  This causes the function
to return -EINVAL when flags are set on the type (for example
NLA_F_NESTED).

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/rtnetlink.c

index a585d45cc9d9faefbc51fde485971a1336065e58..5fb8d7e472941fede3595a3a4032cfc21fbe849b 100644 (file)
@@ -2621,7 +2621,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                struct rtattr *attr = (void *)nlh + NLMSG_ALIGN(min_len);
 
                while (RTA_OK(attr, attrlen)) {
-                       unsigned int flavor = attr->rta_type;
+                       unsigned int flavor = attr->rta_type & NLA_TYPE_MASK;
                        if (flavor) {
                                if (flavor > rta_max[sz_idx])
                                        return -EINVAL;