diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2013-03-13 04:18:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 12:05:59 -0700 |
| commit | 110789df9f88361dcf6b5dad53a38ea2f88cad77 (patch) | |
| tree | e150314d49d7b65004dffb356a2c48e65a84255d | |
| parent | 1b92d599fe0f704d9981063d39339fea1f9bd092 (diff) | |
| download | kernel_samsung_smdk4412-110789df9f88361dcf6b5dad53a38ea2f88cad77.zip kernel_samsung_smdk4412-110789df9f88361dcf6b5dad53a38ea2f88cad77.tar.gz kernel_samsung_smdk4412-110789df9f88361dcf6b5dad53a38ea2f88cad77.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/core/rtnetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 222312e..81c16d3 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2011,7 +2011,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; |