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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B89EAC433ED for ; Mon, 12 Apr 2021 16:37:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93DDE60FD7 for ; Mon, 12 Apr 2021 16:37:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245159AbhDLQiB (ORCPT ); Mon, 12 Apr 2021 12:38:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:57636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245131AbhDLQ3m (ORCPT ); Mon, 12 Apr 2021 12:29:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C3D14613A9; Mon, 12 Apr 2021 16:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244746; bh=rKFoYmMFAwIlGwhmd+Fclhva+2Md0QWwljLeYRG30Qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t9r9xXkcTgNQ5DHd/DadOyUwnJ2qSGMgQz9pggWbyZciv7JhAhc1qT92Qt8QKQ46Y 0yY5eC5GQkBbp3gqyRD/aXKBNCS4hXYeiCwLlhRnB4XPRrcyO54GY/HWgITZ5+JHTq TYlA1pMp7pQTaaQKYwazuuvhUjPxX0F7hgwHeoBFL9psKyk5u8wLw2JLUpb1e3RpoW HO4/vOe+f75JfsMXf7JERJPc1m8+33BrVUljXfGJt3cdRa3mjZAO9HFcx41YGKIGDD zrS7E59BWKIUihzOz6LXOUNT6rvcM1wqqGoRcFhyoShPZ6E/czo5q/TXc+HhFUUj7i Zz4nw9tRcWZTw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Santosh Shilimkar , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com Subject: [PATCH AUTOSEL 5.4 35/39] net/rds: Avoid potential use after free in rds_send_remove_from_sock Date: Mon, 12 Apr 2021 12:24:57 -0400 Message-Id: <20210412162502.314854-35-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162502.314854-1-sashal@kernel.org> References: <20210412162502.314854-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: linux-kernel@vger.kernel.org From: Aditya Pakki [ Upstream commit 0c85a7e87465f2d4cbc768e245f4f45b2f299b05 ] In case of rs failure in rds_send_remove_from_sock(), the 'rm' resource is freed and later under spinlock, causing potential use-after-free. Set the free pointer to NULL to avoid undefined behavior. Signed-off-by: Aditya Pakki Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/rds/message.c | 1 + net/rds/send.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/rds/message.c b/net/rds/message.c index 2d43e13d6dd5..c3ecde854454 100644 --- a/net/rds/message.c +++ b/net/rds/message.c @@ -180,6 +180,7 @@ 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 68e2bdb08fd0..aa3bc081773f 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) + if (was_on_sock && rm) rds_message_put(rm); } -- 2.30.2