From patchwork Mon May 6 03:17:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaozhengchao X-Patchwork-Id: 13654866 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 626A8446AD; Mon, 6 May 2024 03:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714965175; cv=none; b=IiloKMBeXzG5NQlWmYSf5Ye9pmtTEqkfYQ0d74L65bJFC+WDPNDGZEqV9yewx9Lza+FBLzS60Smt0Ox3twnuyGnv6pwv36bYs54CqgNlNLPsgETC/lwHsioZkvxRFqxkkakoMfug24KyjF29bUxAMeyWCsP+yE94VTw1DALmXgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714965175; c=relaxed/simple; bh=Di4Dr1jMevpF94ywNAsHk7BIbRL2RRmOjyRhvVLpJbs=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=ObE1SzX1LItBxQtCXEuak1NIjc2vnGKwu186gpfbTIl06T73aGFZuDZKi1dMW/rhvNkxmBj4NMSeugpniOKi/8NdDdCOf4L46uyVZCS5CW03q8MZQhaWTXfzRLQyP+/dbOh61d1xrzfqt1pSzwAOSx1ToB3LkGyHG1Vp/nlKWVQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4VXmcG3MKcz1yn2v; Mon, 6 May 2024 11:10:06 +0800 (CST) Received: from dggpeml500026.china.huawei.com (unknown [7.185.36.106]) by mail.maildlp.com (Postfix) with ESMTPS id 3EE0F1A016F; Mon, 6 May 2024 11:12:50 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 6 May 2024 11:12:49 +0800 From: Zhengchao Shao To: CC: , , , , , , , , , , Subject: [PATCH stable,5.4 0/2] Revert the patchset for fix CVE-2024-26865 Date: Mon, 6 May 2024 11:17:48 +0800 Message-ID: <20240506031750.3169282-1-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500026.china.huawei.com (7.185.36.106) There's no "pernet" variable in the struct hashinfo. The "pernet" variable is introduced from v6.1-rc1. Revert pre-patch and post-patch. Zhengchao Shao (2): Revert "tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()" Revert "tcp: Clean up kernel listener's reqsk in inet_twsk_purge()" net/ipv4/inet_timewait_sock.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)