| From: Michael Riesch <michael.riesch@omicron.at> |
| Date: Mon, 8 Apr 2013 05:45:26 +0000 |
| Subject: rtnetlink: Call nlmsg_parse() with correct header length |
| |
| [ Upstream commit 88c5b5ce5cb57af6ca2a7cf4d5715fa320448ff9 ] |
| |
| Signed-off-by: Michael Riesch <michael.riesch@omicron.at> |
| Cc: "David S. Miller" <davem@davemloft.net> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Jiri Benc <jbenc@redhat.com> |
| Cc: "Theodore Ts'o" <tytso@mit.edu> |
| Cc: linux-kernel@vger.kernel.org |
| Acked-by: Mark Rustad <mark.d.rustad@intel.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| net/core/rtnetlink.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/core/rtnetlink.c |
| +++ b/net/core/rtnetlink.c |
| @@ -1064,7 +1064,7 @@ static int rtnl_dump_ifinfo(struct sk_bu |
| rcu_read_lock(); |
| cb->seq = net->dev_base_seq; |
| |
| - if (nlmsg_parse(cb->nlh, sizeof(struct rtgenmsg), tb, IFLA_MAX, |
| + if (nlmsg_parse(cb->nlh, sizeof(struct ifinfomsg), tb, IFLA_MAX, |
| ifla_policy) >= 0) { |
| |
| if (tb[IFLA_EXT_MASK]) |
| @@ -1907,7 +1907,7 @@ static u16 rtnl_calcit(struct sk_buff *s |
| u32 ext_filter_mask = 0; |
| u16 min_ifinfo_dump_size = 0; |
| |
| - if (nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, IFLA_MAX, |
| + if (nlmsg_parse(nlh, sizeof(struct ifinfomsg), tb, IFLA_MAX, |
| ifla_policy) >= 0) { |
| if (tb[IFLA_EXT_MASK]) |
| ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]); |
