[patch net-next 2/2] [PATCH] net: ip, raw_diag -- Use jump for exiting from nested loop

STALE3571d

2 messages, 2 authors, 2016-11-02 · open the first message on its own page

[patch net-next 2/2] [PATCH] net: ip, raw_diag -- Use jump for exiting from nested loop

From: Cyrill Gorcunov <hidden>
Date: 2016-11-02 12:56:07

I managed to miss that sk_for_each is called under "for"
cycle so need to use goto here to return matching socket.

CC: David S. Miller <davem@davemloft.net>
CC: Eric Dumazet <redacted>
CC: David Ahern <redacted>
CC: Andrey Vagin <redacted>
CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Cyrill Gorcunov <redacted>
---
 net/ipv4/raw_diag.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-ml.git/net/ipv4/raw_diag.c
===================================================================
--- linux-ml.git.orig/net/ipv4/raw_diag.c
+++ linux-ml.git/net/ipv4/raw_diag.c
@@ -79,10 +79,11 @@ static struct sock *raw_sock_get(struct
 				 * hashinfo->lock here.
 				 */
 				sock_hold(sk);
-				break;
+				goto out_unlock;
 			}
 		}
 	}
+out_unlock:
 	read_unlock(&hashinfo->lock);
 
 	return sk ? sk : ERR_PTR(-ENOENT);

Re: [patch net-next 2/2] [PATCH] net: ip, raw_diag -- Use jump for exiting from nested loop

From: David Ahern <hidden>
Date: 2016-11-02 14:57:26

On 11/2/16 6:36 AM, Cyrill Gorcunov wrote:
I managed to miss that sk_for_each is called under "for"
cycle so need to use goto here to return matching socket.

CC: David S. Miller <davem@davemloft.net>
CC: Eric Dumazet <redacted>
CC: David Ahern <redacted>
CC: Andrey Vagin <redacted>
CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Cyrill Gorcunov <redacted>
---
 net/ipv4/raw_diag.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Acked-by: David Ahern <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help