From patchwork Wed Nov 2 12:36:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyrill Gorcunov X-Patchwork-Id: 690382 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3t87Q52XsLz9vDp for ; Wed, 2 Nov 2016 23:56:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=03WyWTnJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753728AbcKBM4K (ORCPT ); Wed, 2 Nov 2016 08:56:10 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:33571 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753376AbcKBM4H (ORCPT ); Wed, 2 Nov 2016 08:56:07 -0400 Received: by mail-lf0-f45.google.com with SMTP id c13so11675890lfg.0 for ; Wed, 02 Nov 2016 05:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:user-agent:date:from:to:cc:subject:mime-version :content-disposition; bh=JlJKnsQzi0CZAiy5/sgIFH5nDGEdmuRwm3AvMefO+NQ=; b=03WyWTnJJuRpI9T9ZjLe9yfgsJv3MqD4D4H3OW0jm6CnOpHvyuPgh373FgkEGR+qlH JO8XI4yxEq0qI7ChgK6fpIV18b9SR1/sBPU4Kag22WHLYJPRveFAmPUMNy6q5n6zSk8T BewYrUF9S03xlU2YsVhaKETqbUpkebfcfouQyU90wtEJkW3JDdoSytZnzgfVnlnFgYWy LPqL1FkS/61rcU+iUMdsDGJGst+B+eZ0U9gNcO2Ao4JRAalEkB/hJO90zVMkPyRQn1jL Sup0qGLfbAZWokrEnVuLlHnz6oKizxsDKNG8a9LJQFYr3f0KSnvO4JU4vZsMK0b2PhLV 5Hyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:message-id:user-agent:date:from:to:cc :subject:mime-version:content-disposition; bh=JlJKnsQzi0CZAiy5/sgIFH5nDGEdmuRwm3AvMefO+NQ=; b=ItIPbuW9bq7z/NsRYIRbJohrXsBpTYlB6kxo5OCP4zM9/IQI1DqA0rrdRfLoyMNc8y 3eETVa0XLApc8g1Bzpjivuuaayr0M+Y0FqXw6qHOpuKUyE9OaK9Elaaf/0oQvL/HelQR u/RpD/bcY/yth3qF62oGEodu7ZuSr6jxc+ZxCgxNt8WjaZGE06daSEE/1gD4ei4gMAiW AIcjYtUuBCt44ZrxHg6ulRr/5mgnS7j2WBjkrEnhLCAKa91lJZTCQhGlaoUN4UoYh0hE tZ1dNo1uJ5GqPh0vU68Q5HHJtAf8iEYRyxWfpLaXlen01rk3XtcZ8MfXuR3AKk3ot1mA Yr4w== X-Gm-Message-State: ABUngveqMp3x5C3S9guVFP5ddt0AJi15Z0v7C6Jfc0vNvSBMN5uKT8OMJqfIJfxEZuFF1A== X-Received: by 10.25.165.144 with SMTP id o138mr2061697lfe.80.1478091365754; Wed, 02 Nov 2016 05:56:05 -0700 (PDT) Received: from uranus.localdomain ([5.18.178.32]) by smtp.gmail.com with ESMTPSA id k2sm435021lfg.7.2016.11.02.05.56.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Nov 2016 05:56:04 -0700 (PDT) Received: by uranus.localdomain (Postfix, from userid 1000) id 55AEC2066A; Wed, 2 Nov 2016 15:54:54 +0300 (MSK) Message-Id: <20161102125454.754267793@openvz.org> User-Agent: quilt/0.64 Date: Wed, 02 Nov 2016 15:36:32 +0300 From: Cyrill Gorcunov To: netdev@vger.kernel.org Cc: Eric Dumazet , "David S. Miller" , David Ahern , Andrey Vagin , Stephen Hemminger , Cyrill Gorcunov Subject: [patch net-next 2/2] [PATCH] net: ip, raw_diag -- Use jump for exiting from nested loop MIME-Version: 1.0 Content-Disposition: inline; filename=inet-diag-raw-break-loop Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 CC: Eric Dumazet CC: David Ahern CC: Andrey Vagin CC: Stephen Hemminger Signed-off-by: Cyrill Gorcunov Acked-by: David Ahern --- 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);