Commit 5c08681b authored by Doug Ledford's avatar Doug Ledford

Merge branch 'k.o/for-rc' into k.o/for-next

Pick up the missing netlink oops fix
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 31acd18b b4d91aeb
...@@ -175,13 +175,24 @@ static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -175,13 +175,24 @@ static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
!netlink_capable(skb, CAP_NET_ADMIN)) !netlink_capable(skb, CAP_NET_ADMIN))
return -EPERM; return -EPERM;
/*
* LS responses overload the 0x100 (NLM_F_ROOT) flag. Don't
* mistakenly call the .dump() function.
*/
if (index == RDMA_NL_LS) {
if (cb_table[op].doit)
return cb_table[op].doit(skb, nlh, extack);
return -EINVAL;
}
/* FIXME: Convert IWCM to properly handle doit callbacks */ /* FIXME: Convert IWCM to properly handle doit callbacks */
if ((nlh->nlmsg_flags & NLM_F_DUMP) || index == RDMA_NL_RDMA_CM || if ((nlh->nlmsg_flags & NLM_F_DUMP) || index == RDMA_NL_RDMA_CM ||
index == RDMA_NL_IWCM) { index == RDMA_NL_IWCM) {
struct netlink_dump_control c = { struct netlink_dump_control c = {
.dump = cb_table[op].dump, .dump = cb_table[op].dump,
}; };
return netlink_dump_start(nls, skb, nlh, &c); if (c.dump)
return netlink_dump_start(nls, skb, nlh, &c);
return -EINVAL;
} }
if (cb_table[op].doit) if (cb_table[op].doit)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment