projects
/
wrapfs-3.14.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a57d91a
)
rtnetlink: Call nlmsg_parse() with correct header length
author
Michael Riesch
<michael.riesch@omicron.at>
Mon, 8 Apr 2013 05:45:26 +0000
(
05:45
+0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 1 May 2013 15:56:37 +0000
(08:56 -0700)
[ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/rtnetlink.c
patch
|
blob
|
history
diff --git
a/net/core/rtnetlink.c
b/net/core/rtnetlink.c
index 81c16d349359b9ec8e75af93e4e10b6a20f8fd5a..b6aaa7a16195b30c9286010616addfadbdf86536 100644
(file)
--- a/
net/core/rtnetlink.c
+++ b/
net/core/rtnetlink.c
@@
-1045,7
+1045,7
@@
static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
rcu_read_lock();
- if (nlmsg_parse(cb->nlh, sizeof(struct
rtgen
msg), tb, IFLA_MAX,
+ if (nlmsg_parse(cb->nlh, sizeof(struct
ifinfo
msg), tb, IFLA_MAX,
ifla_policy) >= 0) {
if (tb[IFLA_EXT_MASK])
@@
-1876,7
+1876,7
@@
static u16 rtnl_calcit(struct sk_buff *skb, struct nlmsghdr *nlh)
u32 ext_filter_mask = 0;
u16 min_ifinfo_dump_size = 0;
- if (nlmsg_parse(nlh, sizeof(struct
rtgen
msg), tb, IFLA_MAX,
+ if (nlmsg_parse(nlh, sizeof(struct
ifinfo
msg), tb, IFLA_MAX,
ifla_policy) >= 0) {
if (tb[IFLA_EXT_MASK])
ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);