提交 76d00160 编写于 作者: M Matt Johnston 提交者: David S. Miller

mctp: Don't let RTM_DELROUTE delete local routes

We need to test against the existing route type, not
the rtm_type in the netlink request.

Fixes: 83f0a0b7 ("mctp: Specify route types, require rtm_type in RTM_*ROUTE messages")
Signed-off-by: NMatt Johnston <matt@codeconstruct.com.au>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 00e158fb
...@@ -952,7 +952,7 @@ static int mctp_route_add(struct mctp_dev *mdev, mctp_eid_t daddr_start, ...@@ -952,7 +952,7 @@ static int mctp_route_add(struct mctp_dev *mdev, mctp_eid_t daddr_start,
} }
static int mctp_route_remove(struct mctp_dev *mdev, mctp_eid_t daddr_start, static int mctp_route_remove(struct mctp_dev *mdev, mctp_eid_t daddr_start,
unsigned int daddr_extent) unsigned int daddr_extent, unsigned char type)
{ {
struct net *net = dev_net(mdev->dev); struct net *net = dev_net(mdev->dev);
struct mctp_route *rt, *tmp; struct mctp_route *rt, *tmp;
...@@ -969,7 +969,8 @@ static int mctp_route_remove(struct mctp_dev *mdev, mctp_eid_t daddr_start, ...@@ -969,7 +969,8 @@ static int mctp_route_remove(struct mctp_dev *mdev, mctp_eid_t daddr_start,
list_for_each_entry_safe(rt, tmp, &net->mctp.routes, list) { list_for_each_entry_safe(rt, tmp, &net->mctp.routes, list) {
if (rt->dev == mdev && if (rt->dev == mdev &&
rt->min == daddr_start && rt->max == daddr_end) { rt->min == daddr_start && rt->max == daddr_end &&
rt->type == type) {
list_del_rcu(&rt->list); list_del_rcu(&rt->list);
/* TODO: immediate RTM_DELROUTE */ /* TODO: immediate RTM_DELROUTE */
mctp_route_release(rt); mctp_route_release(rt);
...@@ -987,7 +988,7 @@ int mctp_route_add_local(struct mctp_dev *mdev, mctp_eid_t addr) ...@@ -987,7 +988,7 @@ int mctp_route_add_local(struct mctp_dev *mdev, mctp_eid_t addr)
int mctp_route_remove_local(struct mctp_dev *mdev, mctp_eid_t addr) int mctp_route_remove_local(struct mctp_dev *mdev, mctp_eid_t addr)
{ {
return mctp_route_remove(mdev, addr, 0); return mctp_route_remove(mdev, addr, 0, RTN_LOCAL);
} }
/* removes all entries for a given device */ /* removes all entries for a given device */
...@@ -1195,7 +1196,7 @@ static int mctp_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -1195,7 +1196,7 @@ static int mctp_delroute(struct sk_buff *skb, struct nlmsghdr *nlh,
if (rtm->rtm_type != RTN_UNICAST) if (rtm->rtm_type != RTN_UNICAST)
return -EINVAL; return -EINVAL;
rc = mctp_route_remove(mdev, daddr_start, rtm->rtm_dst_len); rc = mctp_route_remove(mdev, daddr_start, rtm->rtm_dst_len, RTN_UNICAST);
return rc; return rc;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册