From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Aditya Pakki <pakki001@umn.edu>,
Santosh Shilimkar <santosh.shilimkar@oracle.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
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 [thread overview]
Message-ID: <20210412162502.314854-35-sashal@kernel.org> (raw)
In-Reply-To: <20210412162502.314854-1-sashal@kernel.org>
From: Aditya Pakki <pakki001@umn.edu>
[ 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 <pakki001@umn.edu>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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
next prev parent reply other threads:[~2021-04-12 16:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 16:24 [PATCH AUTOSEL 5.4 01/39] net: ieee802154: fix nl802154 del llsec key Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 02/39] net: ieee802154: fix nl802154 del llsec dev Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 03/39] net: ieee802154: fix nl802154 add llsec key Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 04/39] net: ieee802154: fix nl802154 del llsec devkey Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 05/39] net: ieee802154: nl-mac: fix check on panid Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 11/39] neighbour: Disregard DEAD dst in neigh_update Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 14/39] drivers: net: fix memory leak in atusb_probe Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 15/39] drivers: net: fix memory leak in peak_usb_create_dev Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 19/39] net: ieee802154: forbid monitor for set llsec params Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 20/39] net: ieee802154: stop dump llsec keys for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 21/39] net: ieee802154: forbid monitor for add llsec key Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 22/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 23/39] net: ieee802154: stop dump llsec devs for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 24/39] net: ieee802154: forbid monitor for add llsec dev Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 25/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 26/39] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 27/39] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 28/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 29/39] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 30/39] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 31/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 32/39] net: ieee802154: stop dump llsec params for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 33/39] net: mac802154: Fix general protection fault Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 34/39] pcnet32: Use pci_resource_len to validate PCI resource Sasha Levin
2021-04-12 16:24 ` Sasha Levin [this message]
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 36/39] net: tipc: Fix spelling errors in net/tipc module Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 37/39] mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 5.4 38/39] cfg80211: remove WARN_ON() in cfg80211_sme_connect Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 5.4 39/39] virt_wifi: Return micros for BSS TSF values Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412162502.314854-35-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pakki001@umn.edu \
--cc=rds-devel@oss.oracle.com \
--cc=santosh.shilimkar@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).