Skip to contentSkip to conversation

net: ip, raw_diag -- Use jump for exiting from nested loop

PATCH In review Cyrill Gorcunov 2 participants 2 messages Nov 2, 2016

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

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

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 <[email protected]>
CC Eric Dumazet <[email protected]>
CC David Ahern <[email protected]>
CC Andrey Vagin <[email protected]>
CC Stephen Hemminger <[email protected]>
Signed-off-by Cyrill Gorcunov <[email protected]>
---
 net/ipv4/raw_diag.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/raw_diag.c +2 -1
Index: 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);
Acked-by on v1 2/2
#1 lore raw
Quoted 9 lines · Cyrill Gorcunov

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 <[email protected]>
CC Eric Dumazet <[email protected]>
CC David Ahern <[email protected]>
CC Andrey Vagin <[email protected]>
CC Stephen Hemminger <[email protected]>
Signed-off-by Cyrill Gorcunov <[email protected]>
Quoted 3 lines
---
 net/ipv4/raw_diag.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Acked-by David Ahern <[email protected]>