Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1224591 > unrolled thread

[PATCH V1 net-next] net: only check perm protocol when register proto

Started bymartinbj2008@gmail.com
First post2015-09-15 04:10 +0200
Last post2015-09-18 06:10 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH V1 net-next] net: only check perm protocol when register proto martinbj2008@gmail.com - 2015-09-15 04:10 +0200
    Re: [PATCH V1 net-next] net: only check perm protocol when  register proto David Miller <davem@davemloft.net> - 2015-09-18 01:30 +0200
      [PATCH V2 net-next] net: only check perm protocol when register proto martinbj2008@gmail.com - 2015-09-18 06:10 +0200
        Re: [PATCH V2 net-next] net: only check perm protocol when  register proto David Miller <davem@davemloft.net> - 2015-09-18 06:10 +0200

#1224591 — [PATCH V1 net-next] net: only check perm protocol when register proto

Frommartinbj2008@gmail.com
Date2015-09-15 04:10 +0200
Subject[PATCH V1 net-next] net: only check perm protocol when register proto
Message-ID<q8NR0-7HD-11@gated-at.bofh.it>
From: Junwei Zhang <martinbj2008@gmail.com>

the permanent protocol nodes are at the head of the list.
So only need check all these nodes.

and insert the new node after the last permanent protocol node,
no matter new node is permanent or not.

If the inserted proto conflicts with existing permanent protocol,
then goto out_permanent immediately.

Signed-off-by: Martin Zhang <martinbj2008@gmail.com>
---
 net/ipv4/af_inet.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 1d0c3ad..c61e0b5 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1043,22 +1043,16 @@ void inet_register_protosw(struct inet_protosw *p)
 		goto out_illegal;
 
 	/* If we are trying to override a permanent protocol, bail. */
-	answer = NULL;
 	last_perm = &inetsw[p->type];
 	list_for_each(lh, &inetsw[p->type]) {
 		answer = list_entry(lh, struct inet_protosw, list);
-
 		/* Check only the non-wild match. */
-		if (INET_PROTOSW_PERMANENT & answer->flags) {
-			if (protocol == answer->protocol)
+		if ((INET_PROTOSW_PERMANENT & answer->flags) == 0)
 				break;
-			last_perm = lh;
-		}
-
-		answer = NULL;
+		if (protocol == answer->protocol)
+			goto out_permanent;
+		last_perm = lh;
 	}
-	if (answer)
-		goto out_permanent;
 
 	/* Add the new entry after the last permanent entry if any, so that
 	 * the new entry does not override a permanent entry when matched with
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1227482 — Re: [PATCH V1 net-next] net: only check perm protocol when register proto

FromDavid Miller <davem@davemloft.net>
Date2015-09-18 01:30 +0200
SubjectRe: [PATCH V1 net-next] net: only check perm protocol when register proto
Message-ID<q9QMN-1Oy-7@gated-at.bofh.it>
In reply to#1224591
From: martinbj2008@gmail.com
Date: Tue, 15 Sep 2015 08:14:05 +0800

> @@ -1043,22 +1043,16 @@ void inet_register_protosw(struct inet_protosw *p)
>  		goto out_illegal;
>  
>  	/* If we are trying to override a permanent protocol, bail. */
> -	answer = NULL;
>  	last_perm = &inetsw[p->type];
>  	list_for_each(lh, &inetsw[p->type]) {
>  		answer = list_entry(lh, struct inet_protosw, list);
> -
>  		/* Check only the non-wild match. */
> -		if (INET_PROTOSW_PERMANENT & answer->flags) {
> -			if (protocol == answer->protocol)
> +		if ((INET_PROTOSW_PERMANENT & answer->flags) == 0)
>  				break;
> -			last_perm = lh;

Well, if you're going to do this, you need to fix up the indentation
of that "break;" statement.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1227540 — [PATCH V2 net-next] net: only check perm protocol when register proto

Frommartinbj2008@gmail.com
Date2015-09-18 06:10 +0200
Subject[PATCH V2 net-next] net: only check perm protocol when register proto
Message-ID<q9V9L-8i0-5@gated-at.bofh.it>
In reply to#1227482
From: Junwei Zhang <martinbj2008@gmail.com>

The permanent protocol nodes are at the head of the list,
So only need check all these nodes.

No matter the new node is permanent or not,
insert the new node after the last permanent protocol node,

If the new node conflicts with existing permanent node,
return error.

Signed-off-by: Martin Zhang <martinbj2008@gmail.com>
---
V2: Fix indentation
    rewrite statement
 
 net/ipv4/af_inet.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 1d0c3ad..8a55664 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1043,22 +1043,16 @@ void inet_register_protosw(struct inet_protosw *p)
 		goto out_illegal;
 
 	/* If we are trying to override a permanent protocol, bail. */
-	answer = NULL;
 	last_perm = &inetsw[p->type];
 	list_for_each(lh, &inetsw[p->type]) {
 		answer = list_entry(lh, struct inet_protosw, list);
-
 		/* Check only the non-wild match. */
-		if (INET_PROTOSW_PERMANENT & answer->flags) {
-			if (protocol == answer->protocol)
-				break;
-			last_perm = lh;
-		}
-
-		answer = NULL;
+		if ((INET_PROTOSW_PERMANENT & answer->flags) == 0)
+			break;
+		if (protocol == answer->protocol)
+			goto out_permanent;
+		last_perm = lh;
 	}
-	if (answer)
-		goto out_permanent;
 
 	/* Add the new entry after the last permanent entry if any, so that
 	 * the new entry does not override a permanent entry when matched with
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1227542 — Re: [PATCH V2 net-next] net: only check perm protocol when register proto

FromDavid Miller <davem@davemloft.net>
Date2015-09-18 06:10 +0200
SubjectRe: [PATCH V2 net-next] net: only check perm protocol when register proto
Message-ID<q9V9L-8i0-13@gated-at.bofh.it>
In reply to#1227540
From: martinbj2008@gmail.com
Date: Fri, 18 Sep 2015 00:00:05 -0400

> From: Junwei Zhang <martinbj2008@gmail.com>
> 
> The permanent protocol nodes are at the head of the list,
> So only need check all these nodes.
> 
> No matter the new node is permanent or not,
> insert the new node after the last permanent protocol node,
> 
> If the new node conflicts with existing permanent node,
> return error.
> 
> Signed-off-by: Martin Zhang <martinbj2008@gmail.com>
> ---
> V2: Fix indentation
>     rewrite statement

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web