aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/rtnetlink.c
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2013-03-13 04:18:58 +0000
committerBen Hutchings <ben@decadent.org.uk>2013-03-27 02:41:07 +0000
commit3cf15fabc14a9dd490ace2410a1da3a8d5434505 (patch)
treefa563bccd3dd6cb7fc05da485e1d2de982397dd8 /net/core/rtnetlink.c
parent3bb4aac6d51817928a722617d218d2d67aa11373 (diff)
downloadkernel_samsung_smdk4412-3cf15fabc14a9dd490ace2410a1da3a8d5434505.zip
kernel_samsung_smdk4412-3cf15fabc14a9dd490ace2410a1da3a8d5434505.tar.gz
kernel_samsung_smdk4412-3cf15fabc14a9dd490ace2410a1da3a8d5434505.tar.bz2
rtnetlink: Mask the rta_type when range checking
[ Upstream commit a5b8db91442fce9c9713fcd656c3698f1adde1d6 ] 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r--net/core/rtnetlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 92f8ed8..3b5e680 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2042,7 +2042,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 flavor = attr->rta_type;
+ unsigned int flavor = attr->rta_type & NLA_TYPE_MASK;
if (flavor) {
if (flavor > rta_max[sz_idx])
return -EINVAL;