From patchwork Fri Mar 13 22:51:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 450121 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 BD2A41400EA for ; Sat, 14 Mar 2015 10:00:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=TybzM8Ic; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757396AbbCMXAZ (ORCPT ); Fri, 13 Mar 2015 19:00:25 -0400 Received: from mail-qg0-f73.google.com ([209.85.192.73]:33607 "EHLO mail-qg0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756989AbbCMW6s (ORCPT ); Fri, 13 Mar 2015 18:58:48 -0400 Received: by qgdz107 with SMTP id z107so4317178qgd.0 for ; Fri, 13 Mar 2015 15:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2/leKPzgwaww308n0SkLG+uoSlv6H71ysRvikeRb4so=; b=TybzM8Iccuy48zZmTabaUJESE5YtcZDeYZfdJRmRlEL1tN1SJcokkZUk+7w0jTF2WN dGpK30nOYbAgUVScjo8sSA1cOBtiQxdHFVepDITKKrfBdHL3RGe2iTjrgaOIHnCyl3s4 wS4wBpKS8iQLLA4xch3brvWJnzML3pT9RXANT9rFh/IfKFQjFRgC4aqV2USi3raYNHiL cUjEwjhhJsxMOx9AClV6wFeO6SoGXSJw44Eo5TAvEkHKfF6FEppviast8w2mCYgAK4/i TIErlYLDlKNH5RhvSdQazOrQrk81iaZ5Mr13mOuk+XPNURgZBwkelykYVkTUyOrGWp4o 5zbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2/leKPzgwaww308n0SkLG+uoSlv6H71ysRvikeRb4so=; b=U3GWu+BAiL4hE0OPhyqVgH6Ky1h3IIyQFxqLSeFuO6s5Zxpm82+zafwyv/FyArCHYb 9wXJWzP3RePgPAkVmvYZc1+86Fcv5MuCuwS+4q1ZcYF6al7EuHTNNbrPU1iW5xhMVKHH SprEf+wCnkpN57PHlHEbVZpa9wKEIMU6GoQaqr4dMPdZktNWYCyczJIIQmL4YdEypgL5 1LYgND19GpqNxHP1TFxJK9sCxzuSIdk5eMoDsugdOtUvcWJ7baZ8wjkqm0i2R4GGfOGS vXvi3B1VXgDMMYPjtjR5j0sliCXSYZnKNHZq5phXzvkuG/ZQ0ED7VWcIOoZcHYxSY2Fu UoRw== X-Gm-Message-State: ALoCoQn/KkrMNMNWJBynkB7W9v3v8oKO648mGZR0GTb/T7V9t2ENMizHAJb3pIGG+HWQtp2HTi/E X-Received: by 10.236.30.41 with SMTP id j29mr49456561yha.28.1426287090703; Fri, 13 Mar 2015 15:51:30 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id u27si190729yhu.4.2015.03.13.15.51.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2015 15:51:30 -0700 (PDT) Received: from manihi.mtv.corp.google.com ([172.17.131.143]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id Woc9ahWt.1; Fri, 13 Mar 2015 15:51:30 -0700 Received: by manihi.mtv.corp.google.com (Postfix, from userid 160623) id 12CD6A0B61; Fri, 13 Mar 2015 15:51:30 -0700 (PDT) From: Eric Dumazet To: "David S. Miller" Cc: netdev@vger.kernel.org, Eric Dumazet Subject: [PATCH v2 net-next 2/3] inet_diag: adjust inet_sk_diag_fill() bug condition Date: Fri, 13 Mar 2015 15:51:11 -0700 Message-Id: <1426287072-22175-3-git-send-email-edumazet@google.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1426287072-22175-1-git-send-email-edumazet@google.com> References: <1426287072-22175-1-git-send-email-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org inet_sk_diag_fill() only copes with non timewait and non request socks Signed-off-by: Eric Dumazet --- net/ipv4/inet_diag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index e1e4d8c0384a..d827fe2e3ce0 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -93,7 +93,7 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, return -EMSGSIZE; r = nlmsg_data(nlh); - BUG_ON(sk->sk_state == TCP_TIME_WAIT); + BUG_ON((1 << sk->sk_state) & (TCPF_TIME_WAIT | TCPF_NEW_SYN_RECV)); r->idiag_family = sk->sk_family; r->idiag_state = sk->sk_state;