From edd9927c86462f7bddc00977f9284a44e5ba0466 Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vyasevic@redhat.com>
Date: Wed, 13 Mar 2013 04:18:58 +0000
Subject: [PATCH] --- yaml --- r: 361457 b: refs/heads/master c:
 a5b8db91442fce9c9713fcd656c3698f1adde1d6 h: refs/heads/master i:   361455:
 8a955c5cc26eef2283fc30aecb7d92f5aca713a9 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c764658d908..8d322c9f3bed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c6216d7f118a128678270824b6a1286a63863ca
+refs/heads/master: a5b8db91442fce9c9713fcd656c3698f1adde1d6
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index a585d45cc9d9..5fb8d7e47294 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -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;