From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934802Ab3CZP1v (ORCPT ); Tue, 26 Mar 2013 11:27:51 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:54205 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965460Ab3CZPYM (ORCPT ); Tue, 26 Mar 2013 11:24:12 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Vlad Yasevich , "David S. Miller" , Luis Henriques Subject: [PATCH 145/150] rtnetlink: Mask the rta_type when range checking Date: Tue, 26 Mar 2013 15:20:44 +0000 Message-Id: <1364311249-14454-146-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1364311249-14454-1-git-send-email-luis.henriques@canonical.com> References: <1364311249-14454-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.5.7.9 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Vlad Yasevich commit a5b8db91442fce9c9713fcd656c3698f1adde1d6 upstream. 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 Acked-by: Thomas Graf Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 8f37bec..844ccc6 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2317,7 +2317,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; -- 1.8.1.2