netdev - Re: [PATCH net-next] tipc: replace open-code bearer rcu

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]

Date: Tue, 6 Jun 2023 11:13:01 +0200
From: Larysa Zaremba <larysa.zaremba@...el.com>
To: Xin Long <lucien.xin@...il.com>
CC: network dev <netdev@...r.kernel.org>,
	<tipc-discussion@...ts.sourceforge.net>, <davem@...emloft.net>,
	<kuba@...nel.org>, Eric Dumazet <edumazet@...gle.com>, Paolo Abeni
	<pabeni@...hat.com>, Jon Maloy <jmaloy@...hat.com>, Tung Nguyen
	<tung.q.nguyen@...tech.com.au>
Subject: Re: [PATCH net-next] tipc: replace open-code bearer rcu_dereference
 access in bearer.c

On Mon, Jun 05, 2023 at 10:40:44AM -0400, Xin Long wrote:
> Replace these open-code bearer rcu_dereference access with bearer_get(),
> like other places in bearer.c. While at it, also use tipc_net() instead
> of net_generic(net, tipc_net_id) to get "tn" in bearer.c.
>

>From what I see, logic was not changed.

Reviewed-by: Larysa Zaremba <larysa.zaremba@...el.com>
 
> Signed-off-by: Xin Long <lucien.xin@...il.com>
> ---
>  net/tipc/bearer.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
> index 114140c49108..1d5d3677bdaf 100644
> --- a/net/tipc/bearer.c
> +++ b/net/tipc/bearer.c
> @@ -176,7 +176,7 @@ static int bearer_name_validate(const char *name,
>   */
>  struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
>  {
> -	struct tipc_net *tn = net_generic(net, tipc_net_id);
> +	struct tipc_net *tn = tipc_net(net);
>  	struct tipc_bearer *b;
>  	u32 i;
>  
> @@ -211,11 +211,10 @@ int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
>  
>  void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
>  {
> -	struct tipc_net *tn = net_generic(net, tipc_net_id);
>  	struct tipc_bearer *b;
>  
>  	rcu_read_lock();
> -	b = rcu_dereference(tn->bearer_list[bearer_id]);
> +	b = bearer_get(net, bearer_id);
>  	if (b)
>  		tipc_disc_add_dest(b->disc);
>  	rcu_read_unlock();
> @@ -223,11 +222,10 @@ void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
>  
>  void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest)
>  {
> -	struct tipc_net *tn = net_generic(net, tipc_net_id);
>  	struct tipc_bearer *b;
>  
>  	rcu_read_lock();
> -	b = rcu_dereference(tn->bearer_list[bearer_id]);
> +	b = bearer_get(net, bearer_id);
>  	if (b)
>  		tipc_disc_remove_dest(b->disc);
>  	rcu_read_unlock();
> @@ -534,7 +532,7 @@ int tipc_bearer_mtu(struct net *net, u32 bearer_id)
>  	struct tipc_bearer *b;
>  
>  	rcu_read_lock();
> -	b = rcu_dereference(tipc_net(net)->bearer_list[bearer_id]);
> +	b = bearer_get(net, bearer_id);
>  	if (b)
>  		mtu = b->mtu;
>  	rcu_read_unlock();
> @@ -745,7 +743,7 @@ void tipc_bearer_cleanup(void)
>  
>  void tipc_bearer_stop(struct net *net)
>  {
> -	struct tipc_net *tn = net_generic(net, tipc_net_id);
> +	struct tipc_net *tn = tipc_net(net);
>  	struct tipc_bearer *b;
>  	u32 i;
>  
> @@ -881,7 +879,7 @@ int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb)
>  	struct tipc_bearer *bearer;
>  	struct tipc_nl_msg msg;
>  	struct net *net = sock_net(skb->sk);
> -	struct tipc_net *tn = net_generic(net, tipc_net_id);
> +	struct tipc_net *tn = tipc_net(net);
>  
>  	if (i == MAX_BEARERS)
>  		return 0;
> -- 
> 2.39.1
> 
>