netdev - RE: [net-next 1/2] tipc: update cluster capabilities if node deleted

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CH2PR15MB3575236202A3DB62E731A1109A790@CH2PR15MB3575.namprd15.prod.outlook.com>
Date:   Wed, 6 Nov 2019 19:16:43 +0000
From:   Jon Maloy <jon.maloy@...csson.com>
To:     Hoang Huu Le <hoang.h.le@...tech.com.au>,
        "maloy@...jonn.com" <maloy@...jonn.com>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "tipc-discussion@...ts.sourceforge.net" 
        <tipc-discussion@...ts.sourceforge.net>
Subject: RE: [net-next 1/2] tipc: update cluster capabilities if node deleted

Acked-by: Jon

> -----Original Message-----
> From: Hoang Le <hoang.h.le@...tech.com.au>
> Sent: 6-Nov-19 01:26
> To: Jon Maloy <jon.maloy@...csson.com>; maloy@...jonn.com; netdev@...r.kernel.org; tipc-
> discussion@...ts.sourceforge.net
> Subject: [net-next 1/2] tipc: update cluster capabilities if node deleted
> 
> There are two improvements when re-calculate cluster capabilities:
> 
> - When deleting a specific down node, need to re-calculate.
> - In tipc_node_cleanup(), do not need to re-calculate if node
> is still existing in cluster.
> 
> Acked-by: Jon Maloy <jon.maloy@...csson.com>
> Signed-off-by: Hoang Le <hoang.h.le@...tech.com.au>
> ---
>  net/tipc/node.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/net/tipc/node.c b/net/tipc/node.c
> index 742c04756d72..a20fabd09e7e 100644
> --- a/net/tipc/node.c
> +++ b/net/tipc/node.c
> @@ -665,6 +665,11 @@ static bool tipc_node_cleanup(struct tipc_node *peer)
>  	}
>  	tipc_node_write_unlock(peer);
> 
> +	if (!deleted) {
> +		spin_unlock_bh(&tn->node_list_lock);
> +		return deleted;
> +	}
> +
>  	/* Calculate cluster capabilities */
>  	tn->capabilities = TIPC_NODE_CAPABILITIES;
>  	list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
> @@ -2041,7 +2046,7 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct genl_info *info)
>  	struct net *net = sock_net(skb->sk);
>  	struct tipc_net *tn = net_generic(net, tipc_net_id);
>  	struct nlattr *attrs[TIPC_NLA_NET_MAX + 1];
> -	struct tipc_node *peer;
> +	struct tipc_node *peer, *temp_node;
>  	u32 addr;
>  	int err;
> 
> @@ -2082,6 +2087,11 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct genl_info *info)
>  	tipc_node_write_unlock(peer);
>  	tipc_node_delete(peer);
> 
> +	/* Calculate cluster capabilities */
> +	tn->capabilities = TIPC_NODE_CAPABILITIES;
> +	list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
> +		tn->capabilities &= temp_node->capabilities;
> +	}
>  	err = 0;
>  err_out:
>  	tipc_node_put(peer);
> --
> 2.20.1