[MPTCP][PATCH v4 mptcp-next] Squash to "mptcp: drop flags and ifindex arguments"

[MPTCP][PATCH v4 mptcp-next] Squash to "mptcp: drop flags and ifindex arguments"

[Geliang Tang]

From: Geliang Tang <geliangtang@xiaomi.com>

Fix rcu section and add the non-zero id check.

Signed-off-by: Geliang Tang <geliangtang@xiaomi.com>
---
 net/mptcp/pm_netlink.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 94c68d6093de..47200ae451b9 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1107,16 +1107,17 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
 {
 	struct mptcp_pm_addr_entry *entry;
 
-	rcu_read_lock();
-	entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
-	rcu_read_unlock();
-
-	if (entry) {
-		*flags = entry->flags;
-		*ifindex = entry->ifindex;
-	} else {
-		*flags = 0;
-		*ifindex = 0;
+	*flags = 0;
+	*ifindex = 0;
+
+	if (id) {
+		rcu_read_lock();
+		entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
+		if (entry) {
+			*flags = entry->flags;
+			*ifindex = entry->ifindex;
+		}
+		rcu_read_unlock();
 	}
 
 	return 0;
-- 
2.31.1

Re: [MPTCP][PATCH v4 mptcp-next] Squash to "mptcp: drop flags and ifindex arguments"

[Mat Martineau]

On Thu, 29 Jul 2021, Geliang Tang wrote:

> From: Geliang Tang <geliangtang@xiaomi.com>
>
> Fix rcu section and add the non-zero id check.
>

Looks good to squash, thanks.

-Mat


> Signed-off-by: Geliang Tang <geliangtang@xiaomi.com>
> ---
> net/mptcp/pm_netlink.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 94c68d6093de..47200ae451b9 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1107,16 +1107,17 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
> {
> 	struct mptcp_pm_addr_entry *entry;
>
> -	rcu_read_lock();
> -	entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
> -	rcu_read_unlock();
> -
> -	if (entry) {
> -		*flags = entry->flags;
> -		*ifindex = entry->ifindex;
> -	} else {
> -		*flags = 0;
> -		*ifindex = 0;
> +	*flags = 0;
> +	*ifindex = 0;
> +
> +	if (id) {
> +		rcu_read_lock();
> +		entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
> +		if (entry) {
> +			*flags = entry->flags;
> +			*ifindex = entry->ifindex;
> +		}
> +		rcu_read_unlock();
> 	}
>
> 	return 0;
> -- 
> 2.31.1
>
>
>

--
Mat Martineau
Intel