l2tp: hold tunnel while handling genl tunnel updates (8c0e4215) · Commits · 戴 / test

We need to make sure the tunnel is not going to be destroyed by l2tp_tunnel_destruct() concurrently. Fixes: ("l2tp: Add netlink control API for L2TP") Signed-off-by:

Guillaume Nault <g.nault@alphalink.fr> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/l2tp/l2tp_netlink.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -303,8 +303,8 @@ static int l2tp_nl_cmd_tunnel_modify(struct sk_buff skb, struct genl_info info
		}
		tunnel_id = nla_get_u32(info->attrs[L2TP_ATTR_CONN_ID]);

		tunnel = l2tp_tunnel_find(net, tunnel_id);
		if (tunnel == NULL) {
		tunnel = l2tp_tunnel_get(net, tunnel_id);
		if (!tunnel) {
		ret = -ENODEV;
		goto out;
		}
		@@ -315,6 +315,8 @@ static int l2tp_nl_cmd_tunnel_modify(struct sk_buff skb, struct genl_info info
		ret = l2tp_tunnel_notify(&l2tp_nl_family, info,
		tunnel, L2TP_CMD_TUNNEL_MODIFY);

		l2tp_tunnel_dec_refcount(tunnel);

		out:
		return ret;
		}

Admin message