From 669c9d72de8b5882fc83f57a1a65e949be4d77b6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 22 Oct 2022 09:47:44 +0200 Subject: [PATCH] drop some patches --- ...l-ksz8851-fixes-struct-pointer-issue.patch | 54 ------------------- queue-5.10/series | 1 - ...l-ksz8851-fixes-struct-pointer-issue.patch | 54 ------------------- queue-5.15/series | 1 - 4 files changed, 110 deletions(-) delete mode 100644 queue-5.10/micrel-ksz8851-fixes-struct-pointer-issue.patch delete mode 100644 queue-5.15/micrel-ksz8851-fixes-struct-pointer-issue.patch diff --git a/queue-5.10/micrel-ksz8851-fixes-struct-pointer-issue.patch b/queue-5.10/micrel-ksz8851-fixes-struct-pointer-issue.patch deleted file mode 100644 index 9b19df2c356..00000000000 --- a/queue-5.10/micrel-ksz8851-fixes-struct-pointer-issue.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 15a12840d96b2caa1c2b21308cbf8777c5aefaa6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 22 Aug 2022 16:39:32 -0500 -Subject: micrel: ksz8851: fixes struct pointer issue - -From: Jerry Ray - -[ Upstream commit fef5de753ff01887cfa50990532c3890fccb9338 ] - -Issue found during code review. This bug has no impact as long as the -ks8851_net structure is the first element of the ks8851_net_spi structure. -As long as the offset to the ks8851_net struct is zero, the container_of() -macro is subtracting 0 and therefore no damage done. But if the -ks8851_net_spi struct is ever modified such that the ks8851_net struct -within it is no longer the first element of the struct, then the bug would -manifest itself and cause problems. - -struct ks8851_net is contained within ks8851_net_spi. -ks is contained within kss. -kss is the priv_data of the netdev structure. - -Signed-off-by: Jerry Ray -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/micrel/ks8851_spi.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c -index 4ec7f1615977..8327e7f30476 100644 ---- a/drivers/net/ethernet/micrel/ks8851_spi.c -+++ b/drivers/net/ethernet/micrel/ks8851_spi.c -@@ -415,7 +415,8 @@ static int ks8851_probe_spi(struct spi_device *spi) - - spi->bits_per_word = 8; - -- ks = netdev_priv(netdev); -+ kss = netdev_priv(netdev); -+ ks = &kss->ks8851; - - ks->lock = ks8851_lock_spi; - ks->unlock = ks8851_unlock_spi; -@@ -435,8 +436,6 @@ static int ks8851_probe_spi(struct spi_device *spi) - IRQ_RXPSI) /* RX process stop */ - ks->rc_ier = STD_IRQ; - -- kss = to_ks8851_spi(ks); -- - kss->spidev = spi; - mutex_init(&kss->lock); - INIT_WORK(&kss->tx_work, ks8851_tx_work); --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 3d7fb598fbf..02b9833ca68 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -321,7 +321,6 @@ bpftool-clear-errno-after-libcap-s-checks.patch openvswitch-fix-double-reporting-of-drops-in-dropwat.patch openvswitch-fix-overreporting-of-drops-in-dropwatch.patch tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch -micrel-ksz8851-fixes-struct-pointer-issue.patch wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch xfrm-update-ipcomp_scratches-with-null-when-freed.patch wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch diff --git a/queue-5.15/micrel-ksz8851-fixes-struct-pointer-issue.patch b/queue-5.15/micrel-ksz8851-fixes-struct-pointer-issue.patch deleted file mode 100644 index 9db2292ee7d..00000000000 --- a/queue-5.15/micrel-ksz8851-fixes-struct-pointer-issue.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9e2877d16b6f319f4041e1d8b7005c9b73cb79f4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 22 Aug 2022 16:39:32 -0500 -Subject: micrel: ksz8851: fixes struct pointer issue - -From: Jerry Ray - -[ Upstream commit fef5de753ff01887cfa50990532c3890fccb9338 ] - -Issue found during code review. This bug has no impact as long as the -ks8851_net structure is the first element of the ks8851_net_spi structure. -As long as the offset to the ks8851_net struct is zero, the container_of() -macro is subtracting 0 and therefore no damage done. But if the -ks8851_net_spi struct is ever modified such that the ks8851_net struct -within it is no longer the first element of the struct, then the bug would -manifest itself and cause problems. - -struct ks8851_net is contained within ks8851_net_spi. -ks is contained within kss. -kss is the priv_data of the netdev structure. - -Signed-off-by: Jerry Ray -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/micrel/ks8851_spi.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c -index 479406ecbaa3..13c76352ae8d 100644 ---- a/drivers/net/ethernet/micrel/ks8851_spi.c -+++ b/drivers/net/ethernet/micrel/ks8851_spi.c -@@ -413,7 +413,8 @@ static int ks8851_probe_spi(struct spi_device *spi) - - spi->bits_per_word = 8; - -- ks = netdev_priv(netdev); -+ kss = netdev_priv(netdev); -+ ks = &kss->ks8851; - - ks->lock = ks8851_lock_spi; - ks->unlock = ks8851_unlock_spi; -@@ -433,8 +434,6 @@ static int ks8851_probe_spi(struct spi_device *spi) - IRQ_RXPSI) /* RX process stop */ - ks->rc_ier = STD_IRQ; - -- kss = to_ks8851_spi(ks); -- - kss->spidev = spi; - mutex_init(&kss->lock); - INIT_WORK(&kss->tx_work, ks8851_tx_work); --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 0a8e8573497..8b93b11b05d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -428,7 +428,6 @@ net-ethernet-ti-davinci_mdio-add-workaround-for-erra.patch openvswitch-fix-double-reporting-of-drops-in-dropwat.patch openvswitch-fix-overreporting-of-drops-in-dropwatch.patch tcp-annotate-data-race-around-tcp_md5sig_pool_popula.patch -micrel-ksz8851-fixes-struct-pointer-issue.patch x86-mce-retrieve-poison-range-from-hardware.patch wifi-ath9k-avoid-uninit-memory-read-in-ath9k_htc_rx_.patch thunderbolt-add-back-intel-falcon-ridge-end-to-end-f.patch -- 2.47.3