From patchwork Wed Mar 9 18:22:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weongyo Jeong X-Patchwork-Id: 595184 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 D3F83140307 for ; Thu, 10 Mar 2016 05:22:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=JcnNjpOr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933662AbcCISWZ (ORCPT ); Wed, 9 Mar 2016 13:22:25 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:32877 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933595AbcCISWX (ORCPT ); Wed, 9 Mar 2016 13:22:23 -0500 Received: by mail-pa0-f66.google.com with SMTP id q6so3938880pav.0 for ; Wed, 09 Mar 2016 10:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:reply-to:mime-version :content-disposition:user-agent; bh=4+OFWTXdAtD2716WR6uemknyH2BXmQA1GSKvK36zZxs=; b=JcnNjpOrded5BRSloKiFQgz9fu2fjUdFOjWUQs0vnjV8uWOPVy+c0bJrnejChwZUtv sBqgGjIZX69ODT1TMgeX3aCYUy8nxDSS6Z2VCVZZ8udpoHEawbxW4Q5nM3XKvu+9jNT2 0rjgZ3uFA85xE6W+V626gDy9W3Kr3BLwnQ6YZ3fO5cDYtdNP43xi/9tZHVnVertDK8lM LA+hOxFeMASy7F97maqfbJHJnnAnRh21Vpf0ZMbaOyjoZ2uMpaHkw+qHsxBqocBJY4Qo TQNnwTnzK7fXEiyYmUzvLJUKbq+6PGCEZUBxKjEVBx36kHH3AsgzCGBt+bmqlAiN0lNe gQgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:reply-to :mime-version:content-disposition:user-agent; bh=4+OFWTXdAtD2716WR6uemknyH2BXmQA1GSKvK36zZxs=; b=RB2YCiP+xJ4OOlt6xAhyO2JL+M9bzl3Lt/Xwo1C+8mLBfrQYSSkafT+zgcfTkmy4d2 CEkUydzi/c89DGxtYTgYuU7Ij/XeFxynqE8Nfjy582YTTFUAX/a6zmAhg63CM+xnb45K mFAbH7AssUCcWHCm6sRcjPlZEvyi4OZBGupri+hyorFCGjov+SePfOdFnuSYTN5D5eKK bRBjDuihs6zbk5+QqnxRTxGgZHHqjP5f74Y8yqMCIU2NOUqqntCaTwrwEZIH6PT0M9B+ ZIh3s15lms3+B5VM7JcP9mKzH5FZrtes2cARTbmyWIvdIpbCnRHudGFtOd0BsVy3FXhK fd+A== X-Gm-Message-State: AD7BkJJTXdncN1/4QcekiYbqTHTXJXI3W5y8Rzc4xKNs/8Pa3Iz4m/asJqerKr4hu7WO/g== X-Received: by 10.67.21.205 with SMTP id hm13mr52194123pad.56.1457547742917; Wed, 09 Mar 2016 10:22:22 -0800 (PST) Received: from jwg ([64.235.157.5]) by smtp.gmail.com with ESMTPSA id xn8sm14018893pab.15.2016.03.09.10.22.21 for (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Mar 2016 10:22:21 -0800 (PST) Date: Wed, 9 Mar 2016 10:22:21 -0800 From: Weongyo Jeong To: netdev@vger.kernel.org Subject: [PATCH] inet: set `error' value not under lock_sock(). Message-ID: <20160309182217.GA9708@jwg> Reply-To: Weongyo Jeong MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A trivial patch to set `error' variable while not holding lock_sock(). Signed-off-by: Weongyo Jeong --- net/ipv4/inet_connection_sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 6414891..58bc39f 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -306,14 +306,13 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err) struct request_sock_queue *queue = &icsk->icsk_accept_queue; struct request_sock *req; struct sock *newsk; - int error; + int error = -EINVAL; lock_sock(sk); /* We need to make sure that this socket is listening, * and that it has something pending. */ - error = -EINVAL; if (sk->sk_state != TCP_LISTEN) goto out_err;