Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
From:   Minjie Du <duminjie@vivo.com>
To:     Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        David Ahern <dsahern@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        netdev@vger.kernel.org (open list:NETWORKING [TCP]),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, Minjie Du <duminjie@vivo.com>
Subject: [PATCH v2] net/tcp: use kfree_sensitive() instend of kfree() in two functions
Date:   Thu, 16 Nov 2023 10:22:12 +0800
Message-Id: <20231116022213.28795-1-duminjie@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Axb9vollz/7FpXy1D6upcKezkthpBkS5kwV+9Cn+VXix6g5MQE21A6r7x0ec?=
 =?us-ascii?Q?DkCUa+UEDCHbzWfkNOOy3u30SNX+Zh+Fn+44WjM9QxpR0rjK2McCCAMTdQm/?=
 =?us-ascii?Q?tIdO46DF3PQGbT1Gtfs2ZscsVi3/pexZW90yuzgnj6/ELTFO30CadM2yCJWU?=
 =?us-ascii?Q?j3dtSsDbYSZn2JrVVj9ITY1lKGrUB/1hRECyhE5yshGtjQd2xAGI/8gFNnY7?=
 =?us-ascii?Q?W3L9HpA/8Il9Wv/n7opfoFAxh37lJi6K/e0h73A18hQPRPsLzY8oYzfK7XW2?=
 =?us-ascii?Q?B/mb32/pFyHo4HGCI756tx3tXT9rjfrCrbavnZwELfRnNzqQYhZk/tHAPFiX?=
 =?us-ascii?Q?7oebc3c47gfAyXdjbq7sHtWletEbhSRwSZPbMO3JczU7FLS7CtXkCgdnJOvn?=
 =?us-ascii?Q?oyPkSAJ7h64eYQLFRNAKzXR9kQI6xtxc+SXYML0WZItPp1CaNKvaWWCWCsam?=
 =?us-ascii?Q?SYi4ncZcv/ipK2LJHDZRsswAxRYjc3XKyqJ2EpbPRKAlDgh951r7eSRsPLXu?=
 =?us-ascii?Q?MWEnzXxF+4iX8alb/bVKIWya/HYvpEHi04UsCOri+Sv2QsXeFDhqrryVzai9?=
 =?us-ascii?Q?bgb/Ejrxi+Z1yY1Y0/UKaQrafCpi5GUl6AxHS7qFxLbqLRR88VfDk9+pt3Ur?=
 =?us-ascii?Q?Dwj1OXFJFUrkPdOVqRxgMte/5RKRdRoEAIlruU+ksKU+5cQ8b26OXJ8ag4K9?=
 =?us-ascii?Q?7wvTHXVcSLlvbt67sNHSE0ESfMQPIDQFAqC9RPgclQfJ8m5uxj2bao/KFfmg?=
 =?us-ascii?Q?uvCXc3MqI9dPKWzLoUWjKy1sfdbp85z5imjd9bLFTy5at7llm0q9Lsbgwd5w?=
 =?us-ascii?Q?dLZdTne1uVsM3nXr775/XiTcNAs3w83EaHEkrDx5KFrcxrb3tlypN0jh/vHJ?=
 =?us-ascii?Q?c1X9ObcijqYiKNKQnyWUkviWnG3j2NzarrQF7ciQxyoNW3NpUq+Sca11xxoM?=
 =?us-ascii?Q?hnRcUnUNVd08G7gKppfCrfGMNuO4ieMy1z1soIsXEyJXWhTF/dwiKFKB9q5a?=
 =?us-ascii?Q?7b8EeWDdrQGwzbVVNYS23LuDt3bQ743NLhegAevkPc0tF2SAjMmKiLjYLbqK?=
 =?us-ascii?Q?hdnqIEYRLh9kvHnpO35aEWn5d+Dti0cJVkfRsyn/Et0nzffLM4lCn738UpgT?=
 =?us-ascii?Q?YLARiZzoVqFtmoYY20wQlrE/n+DmUJEpdk40Q5fUwcM3ycRzwwNR4KmLpJsw?=
 =?us-ascii?Q?umI9GKG4+wcSVwJirdKphnJgfIPpRoaE93ceEn1oCdZc+4sAPYKN4SKxOgXH?=
 =?us-ascii?Q?yuI3cOsIoQ0TEwK+PdkZ0CBQmWLZe5dC+sjQbSMMy1UGWgoUKHg/6arMlBV2?=
 =?us-ascii?Q?ZVbsdRv1r2T1uFKlKIq1fNxnRsnVJwXzZ912Xyl1S20BpEdWXlhaZvbX48Ou?=
 =?us-ascii?Q?TTFsU1FwwzxtpXemRcLpJYj0u5J1eYuFKRWS/ih6oLVvnkDd7oXVIux9E8WG?=
 =?us-ascii?Q?YjrBAtgW00z5xcMEwbxxQgIbtWaBUWL6yaNiLJqVQnvXxyHanuFHAm8sWG6j?=
 =?us-ascii?Q?/PwlCb4vxzjL8+6Ng+LGWMGXIRTRXU3TvXU9Oa4tJJUF+0w5l5f5i5yXHzlY?=
 =?us-ascii?Q?yyyX5GSbh7tzhCjtKw4/bMcuLl+zzbNHe5x0EmH2?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 996f7123-83e7-4bc5-1f78-08dbe64ae59e
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB5288.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2023 02:22:35.9487
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JHKjm/gj0/tjReDnGHjMiLsHqbVjpLRV5PHlXehFRAoESKY/PHNn6L1FLeWei7w9mOlQ52+oKyVsJ4SVFEqWwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6349
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 15 Nov 2023 18:22:58 -0800 (PST)

key might contain private information, so use kfree_sensitive to free it.
In tcp_time_wait_init() and tcp_md5_twsk_free_rcu() use kfree_sensitive().

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 net/ipv4/tcp_minisocks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index a9807eeb311c..83686c7e7ce9 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -281,7 +281,7 @@ static void tcp_time_wait_init(struct sock *sk, struct tcp_timewait_sock *tcptw)
 	return;
 out_free:
 	WARN_ON_ONCE(1);
-	kfree(tcptw->tw_md5_key);
+	kfree_sensitive(tcptw->tw_md5_key);
 	tcptw->tw_md5_key = NULL;
 #endif
 }
@@ -368,7 +368,7 @@ static void tcp_md5_twsk_free_rcu(struct rcu_head *head)
 	struct tcp_md5sig_key *key;
 
 	key = container_of(head, struct tcp_md5sig_key, rcu);
-	kfree(key);
+	kfree_sensitive(key);
 	static_branch_slow_dec_deferred(&tcp_md5_needed);
 	tcp_md5_release_sigpool();
 }
-- 
2.39.0