[Devel,RHEL7,COMMIT] ms/net: ip, raw_diag -- Use jump for exiting from nested loop

Submitted by Konstantin Khorenko on Nov. 23, 2016, 3:28 p.m.

Details

Message ID 201611231528.uANFST37010720@finist_cl7.x64_64.work.ct
State New
Series "ipv6: add IPV6_HDRINCL option for raw sockets"
Headers show

Commit Message

Konstantin Khorenko Nov. 23, 2016, 3:28 p.m.
The commit is pushed to "branch-rh7-3.10.0-327.36.1.vz7.20.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.36.1.vz7.20.1
------>
commit b2449114b92fb81c270e5649957f0db7e2fc38dd
Author: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date:   Wed Nov 23 19:28:29 2016 +0400

    ms/net: ip, raw_diag -- Use jump for exiting from nested loop
    
    Patchset description:
    
    These are backports from net-next tree. The patches are needed
    to support c/r of raw sockets (criu part is to be implemented).
    
    https://jira.sw.ru/browse/PSBM-51614
    
    ===
    This patch description:
    
    net-next: 9999370faed945be2913cd34aa24e84317a0ceda
    
    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 <eric.dumazet@gmail.com>
    CC: David Ahern <dsa@cumulusnetworks.com>
    CC: Andrey Vagin <avagin@openvz.org>
    CC: Stephen Hemminger <stephen@networkplumber.org>
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    
    Acked-by: David Ahern <dsa@cumulusnetworks.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
---
 net/ipv4/raw_diag.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c
index 1c31706..05ea95d 100644
--- a/net/ipv4/raw_diag.c
+++ b/net/ipv4/raw_diag.c
@@ -79,10 +79,11 @@  static struct sock *raw_sock_get(struct net *net, const struct inet_diag_req_v2
 				 * hashinfo->lock here.
 				 */
 				sock_hold(sk);
-				break;
+				goto out_unlock;
 			}
 		}
 	}
+out_unlock:
 	read_unlock(&hashinfo->lock);
 
 	return sk ? sk : ERR_PTR(-ENOENT);