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 X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D72CFC433ED for ; Tue, 27 Apr 2021 18:37:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A953E613F6 for ; Tue, 27 Apr 2021 18:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238949AbhD0Sii (ORCPT ); Tue, 27 Apr 2021 14:38:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:54398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238463AbhD0Sii (ORCPT ); Tue, 27 Apr 2021 14:38:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 443D6613F5; Tue, 27 Apr 2021 18:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619548674; bh=HRjW9uUXGYuBGL+XR5YIza9yUm6OYYZgRxTN7MRt0S0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZxUe9u4UdA1/IGMECbjyvo/ziikehrdMJvREXEw3MsNfEiSXCeqZQRfuCk710piev y7j+Q7UFgYyXNaW9vCATHFoYT/OHpjOZCi1nr90PnBkXfQ0D+YpSkHjlTgXyrhzUzI Jz+KYaAeu5oHt3PFSbs0V6OrMsXu6hNB0QzdHAwE= Date: Tue, 27 Apr 2021 20:37:52 +0200 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Aditya Pakki , Santosh Shilimkar , "David S . Miller" Subject: Re: [PATCH 001/190] Revert "net/rds: Avoid potential use after free in rds_send_remove_from_sock" Message-ID: References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> <20210421130105.1226686-2-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421130105.1226686-2-gregkh@linuxfoundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 02:57:56PM +0200, Greg Kroah-Hartman wrote: > This reverts commit 0c85a7e87465f2d4cbc768e245f4f45b2f299b05. > > Commits from @umn.edu addresses have been found to be submitted in "bad > faith" to try to test the kernel community's ability to review "known > malicious" changes. The result of these submissions can be found in a > paper published at the 42nd IEEE Symposium on Security and Privacy > entitled, "Open Source Insecurity: Stealthily Introducing > Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University > of Minnesota) and Kangjie Lu (University of Minnesota). > > Because of this, all submissions from this group must be reverted from > the kernel tree and will need to be re-reviewed again to determine if > they actually are a valid fix. Until that work is complete, remove this > change to ensure that no problems are being introduced into the > codebase. > > Cc: Aditya Pakki > Cc: Santosh Shilimkar > Cc: David S. Miller > Signed-off-by: Greg Kroah-Hartman > --- > net/rds/message.c | 1 - > net/rds/send.c | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/rds/message.c b/net/rds/message.c > index 4fc66ff0f1ec..799034e0f513 100644 > --- a/net/rds/message.c > +++ b/net/rds/message.c > @@ -180,7 +180,6 @@ void rds_message_put(struct rds_message *rm) > rds_message_purge(rm); > > kfree(rm); > - rm = NULL; > } > } > EXPORT_SYMBOL_GPL(rds_message_put); > diff --git a/net/rds/send.c b/net/rds/send.c > index fe5264b9d4b3..985d0b7713ac 100644 > --- a/net/rds/send.c > +++ b/net/rds/send.c > @@ -665,7 +665,7 @@ static void rds_send_remove_from_sock(struct list_head *messages, int status) > unlock_and_drop: > spin_unlock_irqrestore(&rm->m_rs_lock, flags); > rds_message_put(rm); > - if (was_on_sock && rm) > + if (was_on_sock) > rds_message_put(rm); > } > > -- > 2.31.1 > The original, while again messy, looks ok, so I'll drop this revert. greg k-h