From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C43FC7EE32 for ; Sun, 26 Feb 2023 14:56:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230504AbjBZOz6 (ORCPT ); Sun, 26 Feb 2023 09:55:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231249AbjBZOzL (ORCPT ); Sun, 26 Feb 2023 09:55:11 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CEF91B557; Sun, 26 Feb 2023 06:50:53 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id B4B7ECE0E9B; Sun, 26 Feb 2023 14:49:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F17C5C433EF; Sun, 26 Feb 2023 14:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422961; bh=WXKkXSI8K2GM7N13JzwbUscQqIjI+qPkUo6rLRnVHRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eQ7SXtg26ViIo388xFu9mK3Fpi9I4S1dW8y0DLZWK/GUjMMIHDgIaNlCOUXMgSFT8 Avp+yYA+2bl8v+uULYO9QxdIJNveD7Dd3xxHsIm50XCc2xvQvK7MHuAtO3hWfLX96g NdHgQS+YeduGUBK3tnbGndsbCjyi/Hw/zMVDeZ06gtqp3YXuWyCKd4M/NmfoJoz17+ KpaH2dejpSP2gOcM0drpUvnw3qrCJLI/MpwiVO8mdXOBmbu4b9thijK5A7Zp8R8J9Q vbS9h5FB6mo5bZpk3zd2TbfFOnjklIwR3QLbmyNIWYhSjONsWMX5JSH7PG/06GN/s+ 0lPfb5Ih9sMxQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pietro Borrello , Kuniyuki Iwashima , Eric Dumazet , Paolo Abeni , Sasha Levin , davem@davemloft.net, dsahern@kernel.org, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 12/36] inet: fix fast path in __inet_hash_connect() Date: Sun, 26 Feb 2023 09:48:20 -0500 Message-Id: <20230226144845.827893-12-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144845.827893-1-sashal@kernel.org> References: <20230226144845.827893-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Pietro Borrello [ Upstream commit 21cbd90a6fab7123905386985e3e4a80236b8714 ] __inet_hash_connect() has a fast path taken if sk_head(&tb->owners) is equal to the sk parameter. sk_head() returns the hlist_entry() with respect to the sk_node field. However entries in the tb->owners list are inserted with respect to the sk_bind_node field with sk_add_bind_node(). Thus the check would never pass and the fast path never execute. This fast path has never been executed or tested as this bug seems to be present since commit 1da177e4c3f4 ("Linux-2.6.12-rc2"), thus remove it to reduce code complexity. Signed-off-by: Pietro Borrello Reviewed-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Link: https://lore.kernel.org/r/20230112-inet_hash_connect_bind_head-v3-1-b591fd212b93@diag.uniroma1.it Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv4/inet_hashtables.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 410b6b7998caf..39b3db5b61190 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -760,17 +760,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, u32 index; if (port) { - head = &hinfo->bhash[inet_bhashfn(net, port, - hinfo->bhash_size)]; - tb = inet_csk(sk)->icsk_bind_hash; - spin_lock_bh(&head->lock); - if (sk_head(&tb->owners) == sk && !sk->sk_bind_node.next) { - inet_ehash_nolisten(sk, NULL, NULL); - spin_unlock_bh(&head->lock); - return 0; - } - spin_unlock(&head->lock); - /* No definite answer... Walk to established hash table */ + local_bh_disable(); ret = check_established(death_row, sk, port, NULL); local_bh_enable(); return ret; -- 2.39.0