+++ /dev/null
-From 5c96542e731ab35867bd905c8e78a7d80304feab Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Sep 2022 13:06:26 -0700
-Subject: block: Fix the enum blk_eh_timer_return documentation
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-[ Upstream commit b2bed51a5261f4266ecb857bba680a7f668d3ddf ]
-
-The documentation of the blk_eh_timer_return enumeration values does not
-reflect correctly how e.g. the SCSI core uses these values. Fix the
-documentation.
-
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Ming Lei <ming.lei@redhat.com>
-Cc: Hannes Reinecke <hare@suse.de>
-Cc: Damien Le Moal <damien.lemoal@wdc.com>
-Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Fixes: 88b0cfad2888 ("block: document the blk_eh_timer_return values")
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
-Link: https://lore.kernel.org/r/20220920200626.3422296-1-bvanassche@acm.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/blk-mq.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
-index 0fd96e92c6c6..681ee69c85db 100644
---- a/include/linux/blk-mq.h
-+++ b/include/linux/blk-mq.h
-@@ -265,9 +265,16 @@ static inline void rq_list_move(struct request **src, struct request **dst,
- rq_list_add(dst, rq);
- }
-
-+/**
-+ * enum blk_eh_timer_return - How the timeout handler should proceed
-+ * @BLK_EH_DONE: The block driver completed the command or will complete it at
-+ * a later time.
-+ * @BLK_EH_RESET_TIMER: Reset the request timer and continue waiting for the
-+ * request to complete.
-+ */
- enum blk_eh_timer_return {
-- BLK_EH_DONE, /* drivers has completed the command */
-- BLK_EH_RESET_TIMER, /* reset timer and try again */
-+ BLK_EH_DONE,
-+ BLK_EH_RESET_TIMER,
- };
-
- #define BLK_TAG_ALLOC_FIFO 0 /* allocate starting from 0 */
---
-2.35.1
-
+++ /dev/null
-From 59bfff0a5c6ec472dc15cedff5632ba68ab808d7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 22 Aug 2022 16:39:32 -0500
-Subject: micrel: ksz8851: fixes struct pointer issue
-
-From: Jerry Ray <jerry.ray@microchip.com>
-
-[ 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 <jerry.ray@microchip.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 82d55fc27edc..70bc7253454f 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
-
+++ /dev/null
-From e75ebf2da7e0d366f10032c7b4c33039e62edb41 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 08:37:01 -0700
-Subject: net: sched: cls_u32: Avoid memcpy() false-positive warning
-
-From: Kees Cook <keescook@chromium.org>
-
-[ Upstream commit 7cba18332e3635aaae60e4e7d4e52849de50d91b ]
-
-To work around a misbehavior of the compiler's ability to see into
-composite flexible array structs (as detailed in the coming memcpy()
-hardening series[1]), use unsafe_memcpy(), as the sizing,
-bounds-checking, and allocation are all very tightly coupled here.
-This silences the false-positive reported by syzbot:
-
- memcpy: detected field-spanning write (size 80) of single field "&n->sel" at net/sched/cls_u32.c:1043 (size 16)
-
-[1] https://lore.kernel.org/linux-hardening/20220901065914.1417829-2-keescook@chromium.org
-
-Cc: Cong Wang <xiyou.wangcong@gmail.com>
-Cc: Jiri Pirko <jiri@resnulli.us>
-Reported-by: syzbot+a2c4601efc75848ba321@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/lkml/000000000000a96c0b05e97f0444@google.com/
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
-Link: https://lore.kernel.org/r/20220927153700.3071688-1-keescook@chromium.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/sched/cls_u32.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
-index 4d27300c287c..5f33472aad36 100644
---- a/net/sched/cls_u32.c
-+++ b/net/sched/cls_u32.c
-@@ -1040,7 +1040,11 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
- }
- #endif
-
-- memcpy(&n->sel, s, sel_size);
-+ unsafe_memcpy(&n->sel, s, sel_size,
-+ /* A composite flex-array structure destination,
-+ * which was correctly sized with struct_size(),
-+ * bounds-checked against nla_len(), and allocated
-+ * above. */);
- RCU_INIT_POINTER(n->ht_up, ht);
- n->handle = handle;
- n->fshift = s->hmask ? ffs(ntohl(s->hmask)) - 1 : 0;
---
-2.35.1
-
ata-fix-ata_id_has_ncq_autosense.patch
ata-fix-ata_id_has_dipm.patch
mtd-rawnand-meson-fix-bit-map-use-in-meson_nfc_ecc_c.patch
-block-fix-the-enum-blk_eh_timer_return-documentation.patch
md-replace-snprintf-with-scnprintf.patch
md-raid5-ensure-stripe_fill-happens-on-non-read-io-w.patch
md-raid5-remove-unnecessary-bio_put-in-raid5_read_on.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
bpf-adjust-kprobe_multi-entry_ip-for-config_x86_kern.patch
bpf-use-bpf_prog_pack-for-bpf_dispatcher.patch
bluetooth-l2cap-fix-user-after-free.patch
-net-sched-cls_u32-avoid-memcpy-false-positive-warnin.patch
i2c-designware-pci-group-amd-navi-quirk-parts-togeth.patch
r8152-rate-limit-overflow-messages.patch
drm-nouveau-nouveau_bo-fix-potential-memory-leak-in-.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
