drop net-rds-avoid-potential-use-after-free-in-rds_send_r.patch from everywhere.

Stupid professors trying to trick kernel reviewers...

diff --git a/queue-4.14/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-4.14/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index 917860c..0000000
--- a/queue-4.14/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 223d9c65a0f929306cd69e4ccf1f74dad3ed9167 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 4318cc9b78f7..b6765ead733b 100644
---- a/net/rds/message.c
-+++ b/net/rds/message.c
-@@ -91,6 +91,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 23f2d81e7967..3a8e1f72bf33 100644
---- a/net/rds/send.c
-+++ b/net/rds/send.c
-@@ -645,7 +645,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
-

diff --git a/queue-4.14/series b/queue-4.14/series
index c524cbf5320c6e6beaaaf8262e3f3e7b3aae3aeb..e9fe996d9fa520c081caa51ec71bcfa5907748d5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -15,7 +15,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch
 input-i8042-fix-pegatron-c15b-id-entry.patch

diff --git a/queue-4.19/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-4.19/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index 7034728..0000000
--- a/queue-4.19/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ff1a1a262bd5c9680d7c29f4d4f80ad6b82933f9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 4b00b1152a5f..e35c9c914df0 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 26e2c2305f7a..f480a447a432 100644
---- a/net/rds/send.c
-+++ b/net/rds/send.c
-@@ -655,7 +655,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
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 1b9466b81424835855ead3deffc29a5d98a84837..46f6e7bb4ef574b34b7dd0b9de26febee469b404 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -19,7 +19,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch
 input-s6sy761-fix-coordinate-read-bit-shift.patch

diff --git a/queue-4.4/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-4.4/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index 13b5798..0000000
--- a/queue-4.4/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c04acb504c005d8ac0ae208870b806ee877dbae0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 756c73729126..decf2ee33c23 100644
---- a/net/rds/message.c
-+++ b/net/rds/message.c
-@@ -89,6 +89,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 1a3c6acdd3f8..1415a296f7b2 100644
---- a/net/rds/send.c
-+++ b/net/rds/send.c
-@@ -668,7 +668,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
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 1ca4501df7fde208cc69db6281e6ce4b952351a6..e2e336cf89e580f1101f34b4fddaa382a703b0a2 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -14,7 +14,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 input-i8042-fix-pegatron-c15b-id-entry.patch
 scsi-libsas-reset-num_scatter-if-libata-marks-qc-as-nodata.patch

diff --git a/queue-4.9/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-4.9/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index 01da813..0000000
--- a/queue-4.9/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 346e027955df13feb293e8556c35767bd95f8e8a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 6cb91061556a..bee84584ce34 100644
---- a/net/rds/message.c
-+++ b/net/rds/message.c
-@@ -90,6 +90,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 50241d30e16d..a84198e1b87c 100644
---- a/net/rds/send.c
-+++ b/net/rds/send.c
-@@ -640,7 +640,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
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 1d9f1df189f13180631b980e789d1d0b3ec1fb6b..e62fabb7453c83f1346d02763b1217d4d6713cec 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -14,7 +14,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 input-i8042-fix-pegatron-c15b-id-entry.patch
 scsi-libsas-reset-num_scatter-if-libata-marks-qc-as-nodata.patch

diff --git a/queue-5.10/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-5.10/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index 79007bc..0000000
--- a/queue-5.10/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0e5885d82bddd73c5de5ddc79a3f765eecb80bf8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 799034e0f513..4fc66ff0f1ec 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 985d0b7713ac..fe5264b9d4b3 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
-

diff --git a/queue-5.10/series b/queue-5.10/series
index e319e2cb24fc9632099abb123269effa73105faa..c8515f1969f73f1a9fc08d5111d8442c6d9fe67f 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -39,7 +39,6 @@ net-ieee802154-forbid-monitor-for-del-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch
 virt_wifi-return-micros-for-bss-tsf-values.patch

diff --git a/queue-5.11/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-5.11/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index aea324d..0000000
--- a/queue-5.11/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 649dbab00420f7e525a2eb84b7743a32d9ac02cb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 799034e0f513..4fc66ff0f1ec 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 985d0b7713ac..fe5264b9d4b3 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
-

diff --git a/queue-5.11/series b/queue-5.11/series
index b197e3835817306d6326a7ba7226c2d9e265f6a7..e41b9a2ca1af9c4a2c49327742a180ebd0592a3b 100644 (file)
--- a/queue-5.11/series
+++ b/queue-5.11/series
@@ -46,7 +46,6 @@ net-ieee802154-forbid-monitor-for-del-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 drm-amd-display-add-missing-mask-for-dcn3.patch
 mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch

diff --git a/queue-5.4/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch b/queue-5.4/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
deleted file mode 100644 (file)
index 7913792..0000000
--- a/queue-5.4/net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9879523df9063eab9b389b1e7934f0ff23c4bb7a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Apr 2021 19:09:12 -0500
-Subject: net/rds: Avoid potential use after free in rds_send_remove_from_sock
-
-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 92b6b22884d4..ed1d2255ce5a 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
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 0aca272568cdc667b3eababe00e0ef8a3337d76f..f5c5cf7228241efad45f96ea7086d18b7ff780ab 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -33,7 +33,6 @@ net-ieee802154-forbid-monitor-for-del-llsec-devkey.patch
 net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch
 net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch
 pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch
-net-rds-avoid-potential-use-after-free-in-rds_send_r.patch
 net-tipc-fix-spelling-errors-in-net-tipc-module.patch
 mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch
 virt_wifi-return-micros-for-bss-tsf-values.patch