From: Sasha Levin Date: Fri, 10 Mar 2023 10:31:52 +0000 (-0500) Subject: Fixes for 5.4 X-Git-Tag: v6.1.17~46^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec3c86a131f5f7e59dd1333cd81e8bee28daeb18;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/9p-rdma-unmap-receive-dma-buffer-in-rdma_request-pos.patch b/queue-5.4/9p-rdma-unmap-receive-dma-buffer-in-rdma_request-pos.patch new file mode 100644 index 00000000000..e820875cf67 --- /dev/null +++ b/queue-5.4/9p-rdma-unmap-receive-dma-buffer-in-rdma_request-pos.patch @@ -0,0 +1,79 @@ +From dd692e598ed71a9696a7d289dd69ce8e4a86b0f6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Jan 2023 10:04:24 +0800 +Subject: 9p/rdma: unmap receive dma buffer in rdma_request()/post_recv() + +From: Zhengchao Shao + +[ Upstream commit 74a25e6e916cb57dab4267a96fbe8864ed21abdb ] + +When down_interruptible() or ib_post_send() failed in rdma_request(), +receive dma buffer is not unmapped. Add unmap action to error path. +Also if ib_post_recv() failed in post_recv(), dma buffer is not unmapped. +Add unmap action to error path. + +Link: https://lkml.kernel.org/r/20230104020424.611926-1-shaozhengchao@huawei.com +Fixes: fc79d4b104f0 ("9p: rdma: RDMA Transport Support for 9P") +Signed-off-by: Zhengchao Shao +Reviewed-by: Leon Romanovsky +Signed-off-by: Dominique Martinet +Signed-off-by: Eric Van Hensbergen +Signed-off-by: Sasha Levin +--- + net/9p/trans_rdma.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c +index b21c3c2098159..c00e965c082bf 100644 +--- a/net/9p/trans_rdma.c ++++ b/net/9p/trans_rdma.c +@@ -385,6 +385,7 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c) + struct p9_trans_rdma *rdma = client->trans; + struct ib_recv_wr wr; + struct ib_sge sge; ++ int ret; + + c->busa = ib_dma_map_single(rdma->cm_id->device, + c->rc.sdata, client->msize, +@@ -402,7 +403,12 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c) + wr.wr_cqe = &c->cqe; + wr.sg_list = &sge; + wr.num_sge = 1; +- return ib_post_recv(rdma->qp, &wr, NULL); ++ ++ ret = ib_post_recv(rdma->qp, &wr, NULL); ++ if (ret) ++ ib_dma_unmap_single(rdma->cm_id->device, c->busa, ++ client->msize, DMA_FROM_DEVICE); ++ return ret; + + error: + p9_debug(P9_DEBUG_ERROR, "EIO\n"); +@@ -499,7 +505,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) + + if (down_interruptible(&rdma->sq_sem)) { + err = -EINTR; +- goto send_error; ++ goto dma_unmap; + } + + /* Mark request as `sent' *before* we actually send it, +@@ -509,11 +515,14 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) + req->status = REQ_STATUS_SENT; + err = ib_post_send(rdma->qp, &wr, NULL); + if (err) +- goto send_error; ++ goto dma_unmap; + + /* Success */ + return 0; + ++dma_unmap: ++ ib_dma_unmap_single(rdma->cm_id->device, c->busa, ++ c->req->tc.size, DMA_TO_DEVICE); + /* Handle errors that happened during or while preparing the send: */ + send_error: + req->status = REQ_STATUS_ERROR; +-- +2.39.2 + diff --git a/queue-5.4/9p-xen-fix-connection-sequence.patch b/queue-5.4/9p-xen-fix-connection-sequence.patch new file mode 100644 index 00000000000..cb272bb173d --- /dev/null +++ b/queue-5.4/9p-xen-fix-connection-sequence.patch @@ -0,0 +1,117 @@ +From ae4427cdbf31e1b54eb284fe90df0d9c1abca108 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jan 2023 12:30:36 +0100 +Subject: 9p/xen: fix connection sequence + +From: Juergen Gross + +[ Upstream commit c15fe55d14b3b4ded5af2a3260877460a6ffb8ad ] + +Today the connection sequence of the Xen 9pfs frontend doesn't match +the documented sequence. It can work reliably only for a PV 9pfs device +having been added at boot time already, as the frontend is not waiting +for the backend to have set its state to "XenbusStateInitWait" before +reading the backend properties from Xenstore. + +Fix that by following the documented sequence [1] (the documentation +has a bug, so the reference is for the patch fixing that). + +[1]: https://lore.kernel.org/xen-devel/20230130090937.31623-1-jgross@suse.com/T/#u + +Link: https://lkml.kernel.org/r/20230130113036.7087-3-jgross@suse.com +Fixes: 868eb122739a ("xen/9pfs: introduce Xen 9pfs transport driver") +Signed-off-by: Juergen Gross +Reviewed-by: Simon Horman +Signed-off-by: Dominique Martinet +Signed-off-by: Eric Van Hensbergen +Signed-off-by: Sasha Levin +--- + net/9p/trans_xen.c | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c +index 131757aa0e6e2..67e9a7085e13b 100644 +--- a/net/9p/trans_xen.c ++++ b/net/9p/trans_xen.c +@@ -389,12 +389,11 @@ static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev, + return ret; + } + +-static int xen_9pfs_front_probe(struct xenbus_device *dev, +- const struct xenbus_device_id *id) ++static int xen_9pfs_front_init(struct xenbus_device *dev) + { + int ret, i; + struct xenbus_transaction xbt; +- struct xen_9pfs_front_priv *priv = NULL; ++ struct xen_9pfs_front_priv *priv = dev_get_drvdata(&dev->dev); + char *versions, *v; + unsigned int max_rings, max_ring_order, len = 0; + +@@ -420,11 +419,6 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev, + if (max_ring_order < XEN_9PFS_RING_ORDER) + return -EINVAL; + +- priv = kzalloc(sizeof(*priv), GFP_KERNEL); +- if (!priv) +- return -ENOMEM; +- +- priv->dev = dev; + priv->num_rings = XEN_9PFS_NUM_RINGS; + priv->rings = kcalloc(priv->num_rings, sizeof(*priv->rings), + GFP_KERNEL); +@@ -482,23 +476,35 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev, + goto error; + } + +- write_lock(&xen_9pfs_lock); +- list_add_tail(&priv->list, &xen_9pfs_devs); +- write_unlock(&xen_9pfs_lock); +- dev_set_drvdata(&dev->dev, priv); +- xenbus_switch_state(dev, XenbusStateInitialised); +- + return 0; + + error_xenbus: + xenbus_transaction_end(xbt, 1); + xenbus_dev_fatal(dev, ret, "writing xenstore"); + error: +- dev_set_drvdata(&dev->dev, NULL); + xen_9pfs_front_free(priv); + return ret; + } + ++static int xen_9pfs_front_probe(struct xenbus_device *dev, ++ const struct xenbus_device_id *id) ++{ ++ struct xen_9pfs_front_priv *priv = NULL; ++ ++ priv = kzalloc(sizeof(*priv), GFP_KERNEL); ++ if (!priv) ++ return -ENOMEM; ++ ++ priv->dev = dev; ++ dev_set_drvdata(&dev->dev, priv); ++ ++ write_lock(&xen_9pfs_lock); ++ list_add_tail(&priv->list, &xen_9pfs_devs); ++ write_unlock(&xen_9pfs_lock); ++ ++ return 0; ++} ++ + static int xen_9pfs_front_resume(struct xenbus_device *dev) + { + dev_warn(&dev->dev, "suspend/resume unsupported\n"); +@@ -517,6 +523,8 @@ static void xen_9pfs_front_changed(struct xenbus_device *dev, + break; + + case XenbusStateInitWait: ++ if (!xen_9pfs_front_init(dev)) ++ xenbus_switch_state(dev, XenbusStateInitialised); + break; + + case XenbusStateConnected: +-- +2.39.2 + diff --git a/queue-5.4/9p-xen-fix-version-parsing.patch b/queue-5.4/9p-xen-fix-version-parsing.patch new file mode 100644 index 00000000000..f13d1c7d578 --- /dev/null +++ b/queue-5.4/9p-xen-fix-version-parsing.patch @@ -0,0 +1,63 @@ +From f45d467f35dc75e7b705efeef726d0fe3d20d9a4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jan 2023 12:30:35 +0100 +Subject: 9p/xen: fix version parsing + +From: Juergen Gross + +[ Upstream commit f1956f4ec15195ec60976d9b5625326285ab102e ] + +When connecting the Xen 9pfs frontend to the backend, the "versions" +Xenstore entry written by the backend is parsed in a wrong way. + +The "versions" entry is defined to contain the versions supported by +the backend separated by commas (e.g. "1,2"). Today only version "1" +is defined. Unfortunately the frontend doesn't look for "1" being +listed in the entry, but it is expecting the entry to have the value +"1". + +This will result in failure as soon as the backend will support e.g. +versions "1" and "2". + +Fix that by scanning the entry correctly. + +Link: https://lkml.kernel.org/r/20230130113036.7087-2-jgross@suse.com +Fixes: 71ebd71921e4 ("xen/9pfs: connect to the backend") +Signed-off-by: Juergen Gross +Reviewed-by: Simon Horman +Signed-off-by: Dominique Martinet +Signed-off-by: Eric Van Hensbergen +Signed-off-by: Sasha Levin +--- + net/9p/trans_xen.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c +index f043938ae782d..131757aa0e6e2 100644 +--- a/net/9p/trans_xen.c ++++ b/net/9p/trans_xen.c +@@ -395,13 +395,19 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev, + int ret, i; + struct xenbus_transaction xbt; + struct xen_9pfs_front_priv *priv = NULL; +- char *versions; ++ char *versions, *v; + unsigned int max_rings, max_ring_order, len = 0; + + versions = xenbus_read(XBT_NIL, dev->otherend, "versions", &len); + if (IS_ERR(versions)) + return PTR_ERR(versions); +- if (strcmp(versions, "1")) { ++ for (v = versions; *v; v++) { ++ if (simple_strtoul(v, &v, 10) == 1) { ++ v = NULL; ++ break; ++ } ++ } ++ if (v) { + kfree(versions); + return -EINVAL; + } +-- +2.39.2 + diff --git a/queue-5.4/arm-dts-spear320-hmi-correct-stmpe-gpio-compatible.patch b/queue-5.4/arm-dts-spear320-hmi-correct-stmpe-gpio-compatible.patch new file mode 100644 index 00000000000..7ae31b98ff2 --- /dev/null +++ b/queue-5.4/arm-dts-spear320-hmi-correct-stmpe-gpio-compatible.patch @@ -0,0 +1,37 @@ +From 272629401b22c6736ff92f0afd688485841da3ff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 25 Feb 2023 17:22:37 +0100 +Subject: ARM: dts: spear320-hmi: correct STMPE GPIO compatible + +From: Krzysztof Kozlowski + +[ Upstream commit 33a0c1b850c8c85f400531dab3a0b022cdb164b1 ] + +The compatible is st,stmpe-gpio. + +Fixes: e2eb69183ec4 ("ARM: SPEAr320: DT: Add SPEAr 320 HMI board support") +Signed-off-by: Krzysztof Kozlowski +Acked-by: Viresh Kumar +Link: https://lore.kernel.org/r/20230225162237.40242-1-krzysztof.kozlowski@linaro.org +Signed-off-by: Arnd Bergmann +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/spear320-hmi.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts +index 367ba48aac3e5..5c562fb4886f4 100644 +--- a/arch/arm/boot/dts/spear320-hmi.dts ++++ b/arch/arm/boot/dts/spear320-hmi.dts +@@ -242,7 +242,7 @@ + irq-trigger = <0x1>; + + stmpegpio: stmpe-gpio { +- compatible = "stmpe,gpio"; ++ compatible = "st,stmpe-gpio"; + reg = <0>; + gpio-controller; + #gpio-cells = <2>; +-- +2.39.2 + diff --git a/queue-5.4/f2fs-use-memcpy_-to-from-_page-where-possible.patch b/queue-5.4/f2fs-use-memcpy_-to-from-_page-where-possible.patch new file mode 100644 index 00000000000..af57aaca2ca --- /dev/null +++ b/queue-5.4/f2fs-use-memcpy_-to-from-_page-where-possible.patch @@ -0,0 +1,158 @@ +From 179de6f841b448decde436fc6bcbd4abf0b5e944 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Aug 2022 15:33:00 -0700 +Subject: f2fs: use memcpy_{to,from}_page() where possible + +From: Eric Biggers + +[ Upstream commit b87846bd61c7c09560617da416208a5454530d57 ] + +This is simpler, and as a side effect it replaces several uses of +kmap_atomic() with its recommended replacement kmap_local_page(). + +Signed-off-by: Eric Biggers +Reviewed-by: Fabio M. De Francesco +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Stable-dep-of: b1b9896718bc ("fs: f2fs: initialize fsdata in pagecache_write()") +Signed-off-by: Sasha Levin +--- + fs/f2fs/inline.c | 15 ++++----------- + fs/f2fs/super.c | 11 ++--------- + fs/f2fs/verity.c | 10 ++-------- + 3 files changed, 8 insertions(+), 28 deletions(-) + +diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c +index 58b77f0b0a05a..a700df05cd182 100644 +--- a/fs/f2fs/inline.c ++++ b/fs/f2fs/inline.c +@@ -43,7 +43,6 @@ bool f2fs_may_inline_dentry(struct inode *inode) + void f2fs_do_read_inline_data(struct page *page, struct page *ipage) + { + struct inode *inode = page->mapping->host; +- void *src_addr, *dst_addr; + + if (PageUptodate(page)) + return; +@@ -53,11 +52,8 @@ void f2fs_do_read_inline_data(struct page *page, struct page *ipage) + zero_user_segment(page, MAX_INLINE_DATA(inode), PAGE_SIZE); + + /* Copy the whole inline data block */ +- src_addr = inline_data_addr(inode, ipage); +- dst_addr = kmap_atomic(page); +- memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode)); +- flush_dcache_page(page); +- kunmap_atomic(dst_addr); ++ memcpy_to_page(page, 0, inline_data_addr(inode, ipage), ++ MAX_INLINE_DATA(inode)); + if (!PageUptodate(page)) + SetPageUptodate(page); + } +@@ -224,7 +220,6 @@ int f2fs_convert_inline_inode(struct inode *inode) + + int f2fs_write_inline_data(struct inode *inode, struct page *page) + { +- void *src_addr, *dst_addr; + struct dnode_of_data dn; + int err; + +@@ -241,10 +236,8 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) + f2fs_bug_on(F2FS_I_SB(inode), page->index); + + f2fs_wait_on_page_writeback(dn.inode_page, NODE, true, true); +- src_addr = kmap_atomic(page); +- dst_addr = inline_data_addr(inode, dn.inode_page); +- memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode)); +- kunmap_atomic(src_addr); ++ memcpy_from_page(inline_data_addr(inode, dn.inode_page), ++ page, 0, MAX_INLINE_DATA(inode)); + set_page_dirty(dn.inode_page); + + f2fs_clear_page_cache_dirty_tag(page); +diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c +index 3f2fe60346401..401bc0e7f6eb0 100644 +--- a/fs/f2fs/super.c ++++ b/fs/f2fs/super.c +@@ -1824,7 +1824,6 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, + size_t toread; + loff_t i_size = i_size_read(inode); + struct page *page; +- char *kaddr; + + if (off > i_size) + return 0; +@@ -1857,9 +1856,7 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, + return -EIO; + } + +- kaddr = kmap_atomic(page); +- memcpy(data, kaddr + offset, tocopy); +- kunmap_atomic(kaddr); ++ memcpy_from_page(data, page, offset, tocopy); + f2fs_put_page(page, 1); + + offset = 0; +@@ -1881,7 +1878,6 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, + size_t towrite = len; + struct page *page; + void *fsdata = NULL; +- char *kaddr; + int err = 0; + int tocopy; + +@@ -1900,10 +1896,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, + break; + } + +- kaddr = kmap_atomic(page); +- memcpy(kaddr + offset, data, tocopy); +- kunmap_atomic(kaddr); +- flush_dcache_page(page); ++ memcpy_to_page(page, offset, data, tocopy); + + a_ops->write_end(NULL, mapping, off, tocopy, tocopy, + page, fsdata); +diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c +index 7944a08a3977e..e5a47782a97ef 100644 +--- a/fs/f2fs/verity.c ++++ b/fs/f2fs/verity.c +@@ -45,16 +45,13 @@ static int pagecache_read(struct inode *inode, void *buf, size_t count, + size_t n = min_t(size_t, count, + PAGE_SIZE - offset_in_page(pos)); + struct page *page; +- void *addr; + + page = read_mapping_page(inode->i_mapping, pos >> PAGE_SHIFT, + NULL); + if (IS_ERR(page)) + return PTR_ERR(page); + +- addr = kmap_atomic(page); +- memcpy(buf, addr + offset_in_page(pos), n); +- kunmap_atomic(addr); ++ memcpy_from_page(buf, page, offset_in_page(pos), n); + + put_page(page); + +@@ -80,7 +77,6 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, + PAGE_SIZE - offset_in_page(pos)); + struct page *page; + void *fsdata; +- void *addr; + int res; + + res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0, +@@ -88,9 +84,7 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, + if (res) + return res; + +- addr = kmap_atomic(page); +- memcpy(addr + offset_in_page(pos), buf, n); +- kunmap_atomic(addr); ++ memcpy_to_page(page, offset_in_page(pos), buf, n); + + res = pagecache_write_end(NULL, inode->i_mapping, pos, n, n, + page, fsdata); +-- +2.39.2 + diff --git a/queue-5.4/firmware-efi-sysfb_efi-add-quirk-for-lenovo-ideapad-.patch b/queue-5.4/firmware-efi-sysfb_efi-add-quirk-for-lenovo-ideapad-.patch new file mode 100644 index 00000000000..393de1d3334 --- /dev/null +++ b/queue-5.4/firmware-efi-sysfb_efi-add-quirk-for-lenovo-ideapad-.patch @@ -0,0 +1,43 @@ +From d19cbedba10597948e80b077663e79b21bbe7c9f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Feb 2023 11:50:45 +0000 +Subject: firmware/efi sysfb_efi: Add quirk for Lenovo IdeaPad Duet 3 + +From: Darrell Kavanagh + +[ Upstream commit e1d447157f232c650e6f32c9fb89ff3d0207c69a ] + +Another Lenovo convertable which reports a landscape resolution of +1920x1200 with a pitch of (1920 * 4) bytes, while the actual framebuffer +has a resolution of 1200x1920 with a pitch of (1200 * 4) bytes. + +Signed-off-by: Darrell Kavanagh +Reviewed-by: Hans de Goede +Signed-off-by: Ard Biesheuvel +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/sysfb_efi.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c +index 653b7f617b61b..9ea65611fba0b 100644 +--- a/arch/x86/kernel/sysfb_efi.c ++++ b/arch/x86/kernel/sysfb_efi.c +@@ -264,6 +264,14 @@ static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = { + "Lenovo ideapad D330-10IGM"), + }, + }, ++ { ++ /* Lenovo IdeaPad Duet 3 10IGL5 with 1200x1920 portrait screen */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, ++ "IdeaPad Duet 3 10IGL5"), ++ }, ++ }, + {}, + }; + +-- +2.39.2 + diff --git a/queue-5.4/fs-f2fs-initialize-fsdata-in-pagecache_write.patch b/queue-5.4/fs-f2fs-initialize-fsdata-in-pagecache_write.patch new file mode 100644 index 00000000000..290c3a0260f --- /dev/null +++ b/queue-5.4/fs-f2fs-initialize-fsdata-in-pagecache_write.patch @@ -0,0 +1,40 @@ +From 9f4bfef56e46b7d7e5915aea71cbdd4eea93993e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Nov 2022 12:21:32 +0100 +Subject: fs: f2fs: initialize fsdata in pagecache_write() + +From: Alexander Potapenko + +[ Upstream commit b1b9896718bc1a212dc288ad66a5fa2fef11353d ] + +When aops->write_begin() does not initialize fsdata, KMSAN may report +an error passing the latter to aops->write_end(). + +Fix this by unconditionally initializing fsdata. + +Suggested-by: Eric Biggers +Fixes: 95ae251fe828 ("f2fs: add fs-verity support") +Signed-off-by: Alexander Potapenko +Reviewed-by: Eric Biggers +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/verity.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c +index e5a47782a97ef..c4bd5a1542524 100644 +--- a/fs/f2fs/verity.c ++++ b/fs/f2fs/verity.c +@@ -76,7 +76,7 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, + size_t n = min_t(size_t, count, + PAGE_SIZE - offset_in_page(pos)); + struct page *page; +- void *fsdata; ++ void *fsdata = NULL; + int res; + + res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0, +-- +2.39.2 + diff --git a/queue-5.4/fs-jfs-fix-shift-exponent-db_agl2size-negative.patch b/queue-5.4/fs-jfs-fix-shift-exponent-db_agl2size-negative.patch new file mode 100644 index 00000000000..d45c1dd90a4 --- /dev/null +++ b/queue-5.4/fs-jfs-fix-shift-exponent-db_agl2size-negative.patch @@ -0,0 +1,41 @@ +From 84b6550e4debb5b17a7b7b7bea5433015d8e3187 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Nov 2022 11:01:59 +0800 +Subject: fs/jfs: fix shift exponent db_agl2size negative + +From: Liu Shixin via Jfs-discussion + +[ Upstream commit fad376fce0af58deebc5075b8539dc05bf639af3 ] + +As a shift exponent, db_agl2size can not be less than 0. Add the missing +check to fix the shift-out-of-bounds bug reported by syzkaller: + + UBSAN: shift-out-of-bounds in fs/jfs/jfs_dmap.c:2227:15 + shift exponent -744642816 is negative + +Reported-by: syzbot+0be96567042453c0c820@syzkaller.appspotmail.com +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Liu Shixin +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/jfs_dmap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c +index aa4643854f947..cc1fed285b2d6 100644 +--- a/fs/jfs/jfs_dmap.c ++++ b/fs/jfs/jfs_dmap.c +@@ -193,7 +193,8 @@ int dbMount(struct inode *ipbmap) + bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth); + bmp->db_agstart = le32_to_cpu(dbmp_le->dn_agstart); + bmp->db_agl2size = le32_to_cpu(dbmp_le->dn_agl2size); +- if (bmp->db_agl2size > L2MAXL2SIZE - L2MAXAG) { ++ if (bmp->db_agl2size > L2MAXL2SIZE - L2MAXAG || ++ bmp->db_agl2size < 0) { + err = -EINVAL; + goto err_release_metapage; + } +-- +2.39.2 + diff --git a/queue-5.4/iio-accel-mma9551_core-prevent-uninitialized-variabl.patch b/queue-5.4/iio-accel-mma9551_core-prevent-uninitialized-variabl.patch new file mode 100644 index 00000000000..c11e2de242b --- /dev/null +++ b/queue-5.4/iio-accel-mma9551_core-prevent-uninitialized-variabl.patch @@ -0,0 +1,48 @@ +From f3dc9512c4d449210dae0027c28563aad7b39a43 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 26 Jan 2023 07:21:46 -0800 +Subject: iio: accel: mma9551_core: Prevent uninitialized variable in + mma9551_read_status_word() + +From: Harshit Mogalapalli + +[ Upstream commit e56d2c34ce9dc122b1a618172ec0e05e50adb9e9 ] + +Smatch Warns: drivers/iio/accel/mma9551_core.c:357 + mma9551_read_status_word() error: uninitialized symbol 'v'. + +When (offset >= 1 << 12) is true mma9551_transfer() will return -EINVAL +without 'v' being initialized, so check for the error and return. + +Note: Not a bug as such because the caller checks return value and +doesn't not use this parameter in the problem case. + +Signed-off-by: Harshit Mogalapalli +Link: https://lore.kernel.org/r/20230126152147.3585874-1-harshit.m.mogalapalli@oracle.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/mma9551_core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c +index 666e7a04a7d7a..aa16d66784944 100644 +--- a/drivers/iio/accel/mma9551_core.c ++++ b/drivers/iio/accel/mma9551_core.c +@@ -354,9 +354,12 @@ int mma9551_read_status_word(struct i2c_client *client, u8 app_id, + + ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_STATUS, + reg, NULL, 0, (u8 *)&v, 2); ++ if (ret < 0) ++ return ret; ++ + *val = be16_to_cpu(v); + +- return ret; ++ return 0; + } + EXPORT_SYMBOL(mma9551_read_status_word); + +-- +2.39.2 + diff --git a/queue-5.4/iio-accel-mma9551_core-prevent-uninitialized-variabl.patch-15017 b/queue-5.4/iio-accel-mma9551_core-prevent-uninitialized-variabl.patch-15017 new file mode 100644 index 00000000000..881fda55a51 --- /dev/null +++ b/queue-5.4/iio-accel-mma9551_core-prevent-uninitialized-variabl.patch-15017 @@ -0,0 +1,49 @@ +From c068fce671a4d54fd3e2464294f887b44c2c5834 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 26 Jan 2023 07:36:09 -0800 +Subject: iio: accel: mma9551_core: Prevent uninitialized variable in + mma9551_read_config_word() + +From: Harshit Mogalapalli + +[ Upstream commit 64a68158738ec8f520347144352f7a09bdb9e169 ] + +Smatch Warns: +drivers/iio/accel/mma9551_core.c:299 + mma9551_read_config_word() error: uninitialized symbol 'v'. + +When (offset >= 1 << 12) is true mma9551_transfer() will return -EINVAL +without 'v' being initialized, so check for the error and return. + +Note: No actual bug as caller checks the return value and does not +use the parameter in the problem case. + +Signed-off-by: Harshit Mogalapalli +Link: https://lore.kernel.org/r/20230126153610.3586243-1-harshit.m.mogalapalli@oracle.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/mma9551_core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c +index aa16d66784944..9bb5c2fea08cf 100644 +--- a/drivers/iio/accel/mma9551_core.c ++++ b/drivers/iio/accel/mma9551_core.c +@@ -296,9 +296,12 @@ int mma9551_read_config_word(struct i2c_client *client, u8 app_id, + + ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_CONFIG, + reg, NULL, 0, (u8 *)&v, 2); ++ if (ret < 0) ++ return ret; ++ + *val = be16_to_cpu(v); + +- return ret; ++ return 0; + } + EXPORT_SYMBOL(mma9551_read_config_word); + +-- +2.39.2 + diff --git a/queue-5.4/ipv6-add-lwtunnel-encap-size-of-all-siblings-in-next.patch b/queue-5.4/ipv6-add-lwtunnel-encap-size-of-all-siblings-in-next.patch new file mode 100644 index 00000000000..573d094a2c6 --- /dev/null +++ b/queue-5.4/ipv6-add-lwtunnel-encap-size-of-all-siblings-in-next.patch @@ -0,0 +1,96 @@ +From f891730aa2793d8135e14d44b0849a8d3ece9ee3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Feb 2023 16:36:28 +0800 +Subject: ipv6: Add lwtunnel encap size of all siblings in nexthop calculation + +From: Lu Wei + +[ Upstream commit 4cc59f386991ec9374cb4bc83dbe1c0b5a95033f ] + +In function rt6_nlmsg_size(), the length of nexthop is calculated +by multipling the nexthop length of fib6_info and the number of +siblings. However if the fib6_info has no lwtunnel but the siblings +have lwtunnels, the nexthop length is less than it should be, and +it will trigger a warning in inet6_rt_notify() as follows: + +WARNING: CPU: 0 PID: 6082 at net/ipv6/route.c:6180 inet6_rt_notify+0x120/0x130 +...... +Call Trace: + + fib6_add_rt2node+0x685/0xa30 + fib6_add+0x96/0x1b0 + ip6_route_add+0x50/0xd0 + inet6_rtm_newroute+0x97/0xa0 + rtnetlink_rcv_msg+0x156/0x3d0 + netlink_rcv_skb+0x5a/0x110 + netlink_unicast+0x246/0x350 + netlink_sendmsg+0x250/0x4c0 + sock_sendmsg+0x66/0x70 + ___sys_sendmsg+0x7c/0xd0 + __sys_sendmsg+0x5d/0xb0 + do_syscall_64+0x3f/0x90 + entry_SYSCALL_64_after_hwframe+0x72/0xdc + +This bug can be reproduced by script: + +ip -6 addr add 2002::2/64 dev ens2 +ip -6 route add 100::/64 via 2002::1 dev ens2 metric 100 + +for i in 10 20 30 40 50 60 70; +do + ip link add link ens2 name ipv_$i type ipvlan + ip -6 addr add 2002::$i/64 dev ipv_$i + ifconfig ipv_$i up +done + +for i in 10 20 30 40 50 60; +do + ip -6 route append 100::/64 encap ip6 dst 2002::$i via 2002::1 +dev ipv_$i metric 100 +done + +ip -6 route append 100::/64 via 2002::1 dev ipv_70 metric 100 + +This patch fixes it by adding nexthop_len of every siblings using +rt6_nh_nlmsg_size(). + +Fixes: beb1afac518d ("net: ipv6: Add support to dump multipath routes via RTA_MULTIPATH attribute") +Signed-off-by: Lu Wei +Reviewed-by: David Ahern +Link: https://lore.kernel.org/r/20230222083629.335683-2-luwei32@huawei.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/ipv6/route.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/net/ipv6/route.c b/net/ipv6/route.c +index badfe69396387..209d52ebbd199 100644 +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -5408,16 +5408,17 @@ static size_t rt6_nlmsg_size(struct fib6_info *f6i) + nexthop_for_each_fib6_nh(f6i->nh, rt6_nh_nlmsg_size, + &nexthop_len); + } else { ++ struct fib6_info *sibling, *next_sibling; + struct fib6_nh *nh = f6i->fib6_nh; + + nexthop_len = 0; + if (f6i->fib6_nsiblings) { +- nexthop_len = nla_total_size(0) /* RTA_MULTIPATH */ +- + NLA_ALIGN(sizeof(struct rtnexthop)) +- + nla_total_size(16) /* RTA_GATEWAY */ +- + lwtunnel_get_encap_size(nh->fib_nh_lws); ++ rt6_nh_nlmsg_size(nh, &nexthop_len); + +- nexthop_len *= f6i->fib6_nsiblings; ++ list_for_each_entry_safe(sibling, next_sibling, ++ &f6i->fib6_siblings, fib6_siblings) { ++ rt6_nh_nlmsg_size(sibling->fib6_nh, &nexthop_len); ++ } + } + nexthop_len += lwtunnel_get_encap_size(nh->fib_nh_lws); + } +-- +2.39.2 + diff --git a/queue-5.4/kernel-fail_function-fix-memory-leak-with-using-debu.patch b/queue-5.4/kernel-fail_function-fix-memory-leak-with-using-debu.patch new file mode 100644 index 00000000000..96e3f97c4ea --- /dev/null +++ b/queue-5.4/kernel-fail_function-fix-memory-leak-with-using-debu.patch @@ -0,0 +1,42 @@ +From 59c054fbd4a446882b93bb7bdaff11202a63ac52 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Feb 2023 16:16:33 +0100 +Subject: kernel/fail_function: fix memory leak with using debugfs_lookup() + +From: Greg Kroah-Hartman + +[ Upstream commit 2bb3669f576559db273efe49e0e69f82450efbca ] + +When calling debugfs_lookup() the result must have dput() called on it, +otherwise the memory will leak over time. To make things simpler, just +call debugfs_lookup_and_remove() instead which handles all of the logic +at once. + +Cc: Andrew Morton +Reviewed-by: Yang Yingliang +Link: https://lore.kernel.org/r/20230202151633.2310897-1-gregkh@linuxfoundation.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + kernel/fail_function.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/kernel/fail_function.c b/kernel/fail_function.c +index b0b1ad93fa957..8f3795d8ac5b0 100644 +--- a/kernel/fail_function.c ++++ b/kernel/fail_function.c +@@ -163,10 +163,7 @@ static void fei_debugfs_add_attr(struct fei_attr *attr) + + static void fei_debugfs_remove_attr(struct fei_attr *attr) + { +- struct dentry *dir; +- +- dir = debugfs_lookup(attr->kp.symbol_name, fei_debugfs_dir); +- debugfs_remove_recursive(dir); ++ debugfs_lookup_and_remove(attr->kp.symbol_name, fei_debugfs_dir); + } + + static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs) +-- +2.39.2 + diff --git a/queue-5.4/media-uvcvideo-handle-cameras-with-invalid-descripto.patch b/queue-5.4/media-uvcvideo-handle-cameras-with-invalid-descripto.patch new file mode 100644 index 00000000000..2e8df97dc6e --- /dev/null +++ b/queue-5.4/media-uvcvideo-handle-cameras-with-invalid-descripto.patch @@ -0,0 +1,36 @@ +From 989aef90bfd0ec0278d5b7c07b989226ce8a71bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 20 Sep 2022 16:04:55 +0200 +Subject: media: uvcvideo: Handle cameras with invalid descriptors + +From: Ricardo Ribalda + +[ Upstream commit 41ddb251c68ac75c101d3a50a68c4629c9055e4c ] + +If the source entity does not contain any pads, do not create a link. + +Reported-by: syzbot +Signed-off-by: Ricardo Ribalda +Reviewed-by: Laurent Pinchart +Signed-off-by: Laurent Pinchart +Signed-off-by: Sasha Levin +--- + drivers/media/usb/uvc/uvc_entity.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c +index ca3a9c2eec271..7c9895377118c 100644 +--- a/drivers/media/usb/uvc/uvc_entity.c ++++ b/drivers/media/usb/uvc/uvc_entity.c +@@ -37,7 +37,7 @@ static int uvc_mc_create_links(struct uvc_video_chain *chain, + continue; + + remote = uvc_entity_by_id(chain->dev, entity->baSourceID[i]); +- if (remote == NULL) ++ if (remote == NULL || remote->num_pads == 0) + return -EINVAL; + + source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING) +-- +2.39.2 + diff --git a/queue-5.4/media-uvcvideo-handle-errors-from-calls-to-usb_strin.patch b/queue-5.4/media-uvcvideo-handle-errors-from-calls-to-usb_strin.patch new file mode 100644 index 00000000000..8a54a1eb7b0 --- /dev/null +++ b/queue-5.4/media-uvcvideo-handle-errors-from-calls-to-usb_strin.patch @@ -0,0 +1,138 @@ +From 357ee01c3147c4934cc940f5845790680ae07c3c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 Oct 2022 16:41:01 +0200 +Subject: media: uvcvideo: Handle errors from calls to usb_string + +From: Guenter Roeck + +[ Upstream commit 4867bb590ae445bcfaa711a86b603c97e94574b3 ] + +On a Webcam from Quanta, we see the following error. + +usb 3-5: New USB device found, idVendor=0408, idProduct=30d2, bcdDevice= 0.03 +usb 3-5: New USB device strings: Mfr=3, Product=1, SerialNumber=2 +usb 3-5: Product: USB2.0 HD UVC WebCam +usb 3-5: Manufacturer: Quanta +usb 3-5: SerialNumber: 0x0001 +... +uvcvideo: Found UVC 1.10 device USB2.0 HD UVC WebCam (0408:30d2) +uvcvideo: Failed to initialize entity for entity 5 +uvcvideo: Failed to register entities (-22). + +The Webcam reports an entity of type UVC_VC_EXTENSION_UNIT. It reports a +string index of '7' associated with that entity. The attempt to read that +string from the camera fails with error -32 (-EPIPE). usb_string() returns +that error, but it is ignored. As result, the entity name is empty. This +later causes v4l2_device_register_subdev() to return -EINVAL, and no +entities are registered as result. + +While this appears to be a firmware problem with the camera, the kernel +should still handle the situation gracefully. To do that, check the return +value from usb_string(). If it reports an error, assign the entity's +default name. + +Signed-off-by: Guenter Roeck +Reviewed-by: Laurent Pinchart +Signed-off-by: Laurent Pinchart +Signed-off-by: Sasha Levin +--- + drivers/media/usb/uvc/uvc_driver.c | 48 ++++++++++++------------------ + 1 file changed, 19 insertions(+), 29 deletions(-) + +diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c +index 40ca1d4e03483..f6c48f22c6724 100644 +--- a/drivers/media/usb/uvc/uvc_driver.c ++++ b/drivers/media/usb/uvc/uvc_driver.c +@@ -1060,10 +1060,8 @@ static int uvc_parse_vendor_control(struct uvc_device *dev, + + n; + memcpy(unit->extension.bmControls, &buffer[23+p], 2*n); + +- if (buffer[24+p+2*n] != 0) +- usb_string(udev, buffer[24+p+2*n], unit->name, +- sizeof(unit->name)); +- else ++ if (buffer[24+p+2*n] == 0 || ++ usb_string(udev, buffer[24+p+2*n], unit->name, sizeof(unit->name)) < 0) + sprintf(unit->name, "Extension %u", buffer[3]); + + list_add_tail(&unit->list, &dev->entities); +@@ -1188,15 +1186,15 @@ static int uvc_parse_standard_control(struct uvc_device *dev, + memcpy(term->media.bmTransportModes, &buffer[10+n], p); + } + +- if (buffer[7] != 0) +- usb_string(udev, buffer[7], term->name, +- sizeof(term->name)); +- else if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) +- sprintf(term->name, "Camera %u", buffer[3]); +- else if (UVC_ENTITY_TYPE(term) == UVC_ITT_MEDIA_TRANSPORT_INPUT) +- sprintf(term->name, "Media %u", buffer[3]); +- else +- sprintf(term->name, "Input %u", buffer[3]); ++ if (buffer[7] == 0 || ++ usb_string(udev, buffer[7], term->name, sizeof(term->name)) < 0) { ++ if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) ++ sprintf(term->name, "Camera %u", buffer[3]); ++ if (UVC_ENTITY_TYPE(term) == UVC_ITT_MEDIA_TRANSPORT_INPUT) ++ sprintf(term->name, "Media %u", buffer[3]); ++ else ++ sprintf(term->name, "Input %u", buffer[3]); ++ } + + list_add_tail(&term->list, &dev->entities); + break; +@@ -1228,10 +1226,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, + + memcpy(term->baSourceID, &buffer[7], 1); + +- if (buffer[8] != 0) +- usb_string(udev, buffer[8], term->name, +- sizeof(term->name)); +- else ++ if (buffer[8] == 0 || ++ usb_string(udev, buffer[8], term->name, sizeof(term->name)) < 0) + sprintf(term->name, "Output %u", buffer[3]); + + list_add_tail(&term->list, &dev->entities); +@@ -1253,10 +1249,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, + + memcpy(unit->baSourceID, &buffer[5], p); + +- if (buffer[5+p] != 0) +- usb_string(udev, buffer[5+p], unit->name, +- sizeof(unit->name)); +- else ++ if (buffer[5+p] == 0 || ++ usb_string(udev, buffer[5+p], unit->name, sizeof(unit->name)) < 0) + sprintf(unit->name, "Selector %u", buffer[3]); + + list_add_tail(&unit->list, &dev->entities); +@@ -1286,10 +1280,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, + if (dev->uvc_version >= 0x0110) + unit->processing.bmVideoStandards = buffer[9+n]; + +- if (buffer[8+n] != 0) +- usb_string(udev, buffer[8+n], unit->name, +- sizeof(unit->name)); +- else ++ if (buffer[8+n] == 0 || ++ usb_string(udev, buffer[8+n], unit->name, sizeof(unit->name)) < 0) + sprintf(unit->name, "Processing %u", buffer[3]); + + list_add_tail(&unit->list, &dev->entities); +@@ -1317,10 +1309,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev, + unit->extension.bmControls = (u8 *)unit + sizeof(*unit); + memcpy(unit->extension.bmControls, &buffer[23+p], n); + +- if (buffer[23+p+n] != 0) +- usb_string(udev, buffer[23+p+n], unit->name, +- sizeof(unit->name)); +- else ++ if (buffer[23+p+n] == 0 || ++ usb_string(udev, buffer[23+p+n], unit->name, sizeof(unit->name)) < 0) + sprintf(unit->name, "Extension %u", buffer[3]); + + list_add_tail(&unit->list, &dev->entities); +-- +2.39.2 + diff --git a/queue-5.4/media-uvcvideo-quirk-for-autosuspend-in-logitech-b91.patch b/queue-5.4/media-uvcvideo-quirk-for-autosuspend-in-logitech-b91.patch new file mode 100644 index 00000000000..18b8b232eb2 --- /dev/null +++ b/queue-5.4/media-uvcvideo-quirk-for-autosuspend-in-logitech-b91.patch @@ -0,0 +1,138 @@ +From 02c1b51c6500b3f5cf3691d8e4ba0af2ce7dd9cf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Jan 2023 11:45:23 +0100 +Subject: media: uvcvideo: Quirk for autosuspend in Logitech B910 and C910 + +From: Ricardo Ribalda + +[ Upstream commit 136effa754b57632f99574fc4a3433e0cfc031d9 ] + +Logitech B910 and C910 firmware are unable to recover from a USB +autosuspend. When it resumes, the device is in a state where it only +produces invalid frames. Eg: + +$ echo 0xFFFF > /sys/module/uvcvideo/parameters/trace # enable verbose log +$ yavta -c1 -n1 --file='frame#.jpg' --format MJPEG --size=1920x1080 /dev/video1 +[350438.435219] uvcvideo: uvc_v4l2_open +[350438.529794] uvcvideo: Resuming interface 2 +[350438.529801] uvcvideo: Resuming interface 3 +[350438.529991] uvcvideo: Trying format 0x47504a4d (MJPG): 1920x1080. +[350438.529996] uvcvideo: Using default frame interval 33333.3 us (30.0 fps). +[350438.551496] uvcvideo: uvc_v4l2_mmap +[350438.555890] uvcvideo: Device requested 3060 B/frame bandwidth. +[350438.555896] uvcvideo: Selecting alternate setting 11 (3060 B/frame bandwidth). +[350438.556362] uvcvideo: Allocated 5 URB buffers of 32x3060 bytes each. +[350439.316468] uvcvideo: Marking buffer as bad (error bit set). +[350439.316475] uvcvideo: Frame complete (EOF found). +[350439.316477] uvcvideo: EOF in empty payload. +[350439.316484] uvcvideo: frame 1 stats: 149/261/417 packets, 1/149/417 pts (early initial), 416/417 scr, last pts/stc/sof 2976325734/2978107243/249 +[350439.384510] uvcvideo: Marking buffer as bad (error bit set). +[350439.384516] uvcvideo: Frame complete (EOF found). +[350439.384518] uvcvideo: EOF in empty payload. +[350439.384525] uvcvideo: frame 2 stats: 265/379/533 packets, 1/265/533 pts (early initial), 532/533 scr, last pts/stc/sof 2979524454/2981305193/316 +[350439.448472] uvcvideo: Marking buffer as bad (error bit set). +[350439.448478] uvcvideo: Frame complete (EOF found). +[350439.448480] uvcvideo: EOF in empty payload. +[350439.448487] uvcvideo: frame 3 stats: 265/377/533 packets, 1/265/533 pts (early initial), 532/533 scr, last pts/stc/sof 2982723174/2984503144/382 +...(loop)... + +The devices can leave this invalid state if the alternate setting of +the streaming interface is toggled. + +This patch adds a quirk for this device so it can be autosuspended +properly. + +lsusb -v: +Bus 001 Device 049: ID 046d:0821 Logitech, Inc. HD Webcam C910 +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 239 Miscellaneous Device + bDeviceSubClass 2 + bDeviceProtocol 1 Interface Association + bMaxPacketSize0 64 + idVendor 0x046d Logitech, Inc. + idProduct 0x0821 HD Webcam C910 + bcdDevice 0.10 + iManufacturer 0 + iProduct 0 + iSerial 1 390022B0 + bNumConfigurations 1 + +Signed-off-by: Ricardo Ribalda +Reviewed-by: Laurent Pinchart +Signed-off-by: Laurent Pinchart +Signed-off-by: Sasha Levin +--- + drivers/media/usb/uvc/uvc_driver.c | 18 ++++++++++++++++++ + drivers/media/usb/uvc/uvc_video.c | 11 +++++++++++ + drivers/media/usb/uvc/uvcvideo.h | 1 + + 3 files changed, 30 insertions(+) + +diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c +index f6c48f22c6724..0caa57a6782aa 100644 +--- a/drivers/media/usb/uvc/uvc_driver.c ++++ b/drivers/media/usb/uvc/uvc_driver.c +@@ -2462,6 +2462,24 @@ static const struct usb_device_id uvc_ids[] = { + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = (kernel_ulong_t)&uvc_quirk_probe_minmax }, ++ /* Logitech, Webcam C910 */ ++ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE ++ | USB_DEVICE_ID_MATCH_INT_INFO, ++ .idVendor = 0x046d, ++ .idProduct = 0x0821, ++ .bInterfaceClass = USB_CLASS_VIDEO, ++ .bInterfaceSubClass = 1, ++ .bInterfaceProtocol = 0, ++ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, ++ /* Logitech, Webcam B910 */ ++ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE ++ | USB_DEVICE_ID_MATCH_INT_INFO, ++ .idVendor = 0x046d, ++ .idProduct = 0x0823, ++ .bInterfaceClass = USB_CLASS_VIDEO, ++ .bInterfaceSubClass = 1, ++ .bInterfaceProtocol = 0, ++ .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, + /* Logitech Quickcam Fusion */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, +diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c +index fe58723fc5ac7..698aecf1aad48 100644 +--- a/drivers/media/usb/uvc/uvc_video.c ++++ b/drivers/media/usb/uvc/uvc_video.c +@@ -1903,6 +1903,17 @@ static int uvc_video_start_transfer(struct uvc_streaming *stream, + uvc_trace(UVC_TRACE_VIDEO, "Selecting alternate setting %u " + "(%u B/frame bandwidth).\n", altsetting, best_psize); + ++ /* ++ * Some devices, namely the Logitech C910 and B910, are unable ++ * to recover from a USB autosuspend, unless the alternate ++ * setting of the streaming interface is toggled. ++ */ ++ if (stream->dev->quirks & UVC_QUIRK_WAKE_AUTOSUSPEND) { ++ usb_set_interface(stream->dev->udev, intfnum, ++ altsetting); ++ usb_set_interface(stream->dev->udev, intfnum, 0); ++ } ++ + ret = usb_set_interface(stream->dev->udev, intfnum, altsetting); + if (ret < 0) + return ret; +diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h +index 5f137400bebd6..6afbfc71bad4b 100644 +--- a/drivers/media/usb/uvc/uvcvideo.h ++++ b/drivers/media/usb/uvc/uvcvideo.h +@@ -199,6 +199,7 @@ + #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400 + #define UVC_QUIRK_FORCE_Y8 0x00000800 + #define UVC_QUIRK_FORCE_BPP 0x00001000 ++#define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 + + /* Format flags */ + #define UVC_FMT_FLAG_COMPRESSED 0x00000001 +-- +2.39.2 + diff --git a/queue-5.4/media-uvcvideo-silence-memcpy-run-time-false-positiv.patch b/queue-5.4/media-uvcvideo-silence-memcpy-run-time-false-positiv.patch new file mode 100644 index 00000000000..71651aba4ee --- /dev/null +++ b/queue-5.4/media-uvcvideo-silence-memcpy-run-time-false-positiv.patch @@ -0,0 +1,60 @@ +From 2ffba02b259e247ef6de1c1b272d70b858f1a09d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 Jan 2023 22:17:04 -0800 +Subject: media: uvcvideo: Silence memcpy() run-time false positive warnings + +From: Kees Cook + +[ Upstream commit b839212988575c701aab4d3d9ca15e44c87e383c ] + +The memcpy() in uvc_video_decode_meta() intentionally copies across the +length and flags members and into the trailing buf flexible array. +Split the copy so that the compiler can better reason about (the lack +of) buffer overflows here. Avoid the run-time false positive warning: + + memcpy: detected field-spanning write (size 12) of single field "&meta->length" at drivers/media/usb/uvc/uvc_video.c:1355 (size 1) + +Additionally fix a typo in the documentation for struct uvc_meta_buf. + +Reported-by: ionut_n2001@yahoo.com +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216810 +Signed-off-by: Kees Cook +Reviewed-by: Laurent Pinchart +Signed-off-by: Laurent Pinchart +Signed-off-by: Sasha Levin +--- + drivers/media/usb/uvc/uvc_video.c | 4 +++- + include/uapi/linux/uvcvideo.h | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c +index 698aecf1aad48..e676a9ef6f0d6 100644 +--- a/drivers/media/usb/uvc/uvc_video.c ++++ b/drivers/media/usb/uvc/uvc_video.c +@@ -1308,7 +1308,9 @@ static void uvc_video_decode_meta(struct uvc_streaming *stream, + if (has_scr) + memcpy(stream->clock.last_scr, scr, 6); + +- memcpy(&meta->length, mem, length); ++ meta->length = mem[0]; ++ meta->flags = mem[1]; ++ memcpy(meta->buf, &mem[2], length - 2); + meta_buf->bytesused += length + sizeof(meta->ns) + sizeof(meta->sof); + + uvc_trace(UVC_TRACE_FRAME, +diff --git a/include/uapi/linux/uvcvideo.h b/include/uapi/linux/uvcvideo.h +index f80f05b3c423f..2140923661934 100644 +--- a/include/uapi/linux/uvcvideo.h ++++ b/include/uapi/linux/uvcvideo.h +@@ -86,7 +86,7 @@ struct uvc_xu_control_query { + * struct. The first two fields are added by the driver, they can be used for + * clock synchronisation. The rest is an exact copy of a UVC payload header. + * Only complete objects with complete buffers are included. Therefore it's +- * always sizeof(meta->ts) + sizeof(meta->sof) + meta->length bytes large. ++ * always sizeof(meta->ns) + sizeof(meta->sof) + meta->length bytes large. + */ + struct uvc_meta_buf { + __u64 ns; +-- +2.39.2 + diff --git a/queue-5.4/mei-bus-fixup-upon-error-print-return-values-of-send.patch b/queue-5.4/mei-bus-fixup-upon-error-print-return-values-of-send.patch new file mode 100644 index 00000000000..a0b8857626e --- /dev/null +++ b/queue-5.4/mei-bus-fixup-upon-error-print-return-values-of-send.patch @@ -0,0 +1,64 @@ +From 9ae3d414904ab2d9cc624c2b32c137fce5a1a183 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 12 Dec 2022 23:49:33 +0200 +Subject: mei: bus-fixup:upon error print return values of send and receive + +From: Alexander Usyskin + +[ Upstream commit 4b8659e2c258e4fdac9ccdf06cc20c0677894ef9 ] + +For easier debugging, upon error, print also return values +from __mei_cl_recv() and __mei_cl_send() functions. + +Signed-off-by: Alexander Usyskin +Signed-off-by: Tomas Winkler +Link: https://lore.kernel.org/r/20221212214933.275434-1-tomas.winkler@intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/misc/mei/bus-fixup.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c +index 0a2b99e1af45f..27262e701f304 100644 +--- a/drivers/misc/mei/bus-fixup.c ++++ b/drivers/misc/mei/bus-fixup.c +@@ -178,7 +178,7 @@ static int mei_fwver(struct mei_cl_device *cldev) + ret = __mei_cl_send(cldev->cl, buf, sizeof(struct mkhi_msg_hdr), + MEI_CL_IO_TX_BLOCKING); + if (ret < 0) { +- dev_err(&cldev->dev, "Could not send ReqFWVersion cmd\n"); ++ dev_err(&cldev->dev, "Could not send ReqFWVersion cmd ret = %d\n", ret); + return ret; + } + +@@ -190,7 +190,7 @@ static int mei_fwver(struct mei_cl_device *cldev) + * Should be at least one version block, + * error out if nothing found + */ +- dev_err(&cldev->dev, "Could not read FW version\n"); ++ dev_err(&cldev->dev, "Could not read FW version ret = %d\n", bytes_recv); + return -EIO; + } + +@@ -339,7 +339,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, + ret = __mei_cl_send(cl, (u8 *)&cmd, sizeof(struct mei_nfc_cmd), + MEI_CL_IO_TX_BLOCKING); + if (ret < 0) { +- dev_err(bus->dev, "Could not send IF version cmd\n"); ++ dev_err(bus->dev, "Could not send IF version cmd ret = %d\n", ret); + return ret; + } + +@@ -354,7 +354,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, + ret = 0; + bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length, 0, 0); + if (bytes_recv < 0 || (size_t)bytes_recv < if_version_length) { +- dev_err(bus->dev, "Could not read IF version\n"); ++ dev_err(bus->dev, "Could not read IF version ret = %d\n", bytes_recv); + ret = -EIO; + goto err; + } +-- +2.39.2 + diff --git a/queue-5.4/mfd-arizona-use-pm_runtime_resume_and_get-to-prevent.patch b/queue-5.4/mfd-arizona-use-pm_runtime_resume_and_get-to-prevent.patch new file mode 100644 index 00000000000..e284737d07d --- /dev/null +++ b/queue-5.4/mfd-arizona-use-pm_runtime_resume_and_get-to-prevent.patch @@ -0,0 +1,38 @@ +From c23e8556c7ffade6ddaf92ea597f5a205fb43af3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 Jan 2023 14:10:55 +0800 +Subject: mfd: arizona: Use pm_runtime_resume_and_get() to prevent refcnt leak + +From: Liang He + +[ Upstream commit 4414a7ab80cebf715045e3c4d465feefbad21139 ] + +In arizona_clk32k_enable(), we should use pm_runtime_resume_and_get() +as pm_runtime_get_sync() will increase the refcnt even when it +returns an error. + +Signed-off-by: Liang He +Acked-by: Charles Keepax +Signed-off-by: Lee Jones +Link: https://lore.kernel.org/r/20230105061055.1509261-1-windhl@126.com +Signed-off-by: Sasha Levin +--- + drivers/mfd/arizona-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c +index 3ff872c205eeb..07d256e6875c0 100644 +--- a/drivers/mfd/arizona-core.c ++++ b/drivers/mfd/arizona-core.c +@@ -45,7 +45,7 @@ int arizona_clk32k_enable(struct arizona *arizona) + if (arizona->clk32k_ref == 1) { + switch (arizona->pdata.clk32k_src) { + case ARIZONA_32KZ_MCLK1: +- ret = pm_runtime_get_sync(arizona->dev); ++ ret = pm_runtime_resume_and_get(arizona->dev); + if (ret != 0) + goto err_ref; + ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]); +-- +2.39.2 + diff --git a/queue-5.4/net-fix-__dev_kfree_skb_any-vs-drop-monitor.patch b/queue-5.4/net-fix-__dev_kfree_skb_any-vs-drop-monitor.patch new file mode 100644 index 00000000000..ff2a71e6c05 --- /dev/null +++ b/queue-5.4/net-fix-__dev_kfree_skb_any-vs-drop-monitor.patch @@ -0,0 +1,49 @@ +From 3791f64ee4157e9bf3cd3d3d50545cd0408de8aa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Feb 2023 08:38:45 +0000 +Subject: net: fix __dev_kfree_skb_any() vs drop monitor + +From: Eric Dumazet + +[ Upstream commit ac3ad19584b26fae9ac86e4faebe790becc74491 ] + +dev_kfree_skb() is aliased to consume_skb(). + +When a driver is dropping a packet by calling dev_kfree_skb_any() +we should propagate the drop reason instead of pretending +the packet was consumed. + +Note: Now we have enum skb_drop_reason we could remove +enum skb_free_reason (for linux-6.4) + +v2: added an unlikely(), suggested by Yunsheng Lin. + +Fixes: e6247027e517 ("net: introduce dev_consume_skb_any()") +Signed-off-by: Eric Dumazet +Cc: Yunsheng Lin +Reviewed-by: Yunsheng Lin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/dev.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/core/dev.c b/net/core/dev.c +index 615cdaac3e729..1a4e20c4ba053 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2735,8 +2735,10 @@ void __dev_kfree_skb_any(struct sk_buff *skb, enum skb_free_reason reason) + { + if (in_irq() || irqs_disabled()) + __dev_kfree_skb_irq(skb, reason); ++ else if (unlikely(reason == SKB_REASON_DROPPED)) ++ kfree_skb(skb); + else +- dev_kfree_skb(skb); ++ consume_skb(skb); + } + EXPORT_SYMBOL(__dev_kfree_skb_any); + +-- +2.39.2 + diff --git a/queue-5.4/net-mlx5-geneve-fix-handling-of-geneve-object-id-as-.patch b/queue-5.4/net-mlx5-geneve-fix-handling-of-geneve-object-id-as-.patch new file mode 100644 index 00000000000..966a7abe2f2 --- /dev/null +++ b/queue-5.4/net-mlx5-geneve-fix-handling-of-geneve-object-id-as-.patch @@ -0,0 +1,41 @@ +From 35c0ee73a79c106a426b12dd049ac02f4b6af130 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Feb 2023 17:44:06 +0200 +Subject: net/mlx5: Geneve, Fix handling of Geneve object id as error code + +From: Maor Dickman + +[ Upstream commit d28a06d7dbedc598a06bd1e53a28125f87ca5d0c ] + +On success, mlx5_geneve_tlv_option_create returns non negative +Geneve object id. In case the object id is positive value the +caller functions will handle it as an error (non zero) and +will fail to offload the Geneve rule. + +Fix this by changing caller function ,mlx5_geneve_tlv_option_add, +to return 0 in case valid non negative object id was provided. + +Fixes: 0ccc171ea6a2 ("net/mlx5: Geneve, Manage Geneve TLV options") +Signed-off-by: Maor Dickman +Reviewed-by: Raed Salem +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c +index 23361a9ae4fa0..6dc83e871cd76 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c +@@ -105,6 +105,7 @@ int mlx5_geneve_tlv_option_add(struct mlx5_geneve *geneve, struct geneve_opt *op + geneve->opt_type = opt->type; + geneve->obj_id = res; + geneve->refcount++; ++ res = 0; + } + + unlock: +-- +2.39.2 + diff --git a/queue-5.4/net-sched-act_sample-fix-action-bind-logic.patch b/queue-5.4/net-sched-act_sample-fix-action-bind-logic.patch new file mode 100644 index 00000000000..595a3a10eb6 --- /dev/null +++ b/queue-5.4/net-sched-act_sample-fix-action-bind-logic.patch @@ -0,0 +1,92 @@ +From 5b0993f3a9629c82e254a5ecca54fc7473e57382 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Feb 2023 12:00:58 -0300 +Subject: net/sched: act_sample: fix action bind logic + +From: Pedro Tammela + +[ Upstream commit 4a20056a49a1854966562241922f68197f950539 ] + +The TC architecture allows filters and actions to be created independently. +In filters the user can reference action objects using: +tc action add action sample ... index 1 +tc filter add ... action pedit index 1 + +In the current code for act_sample this is broken as it checks netlink +attributes for create/update before actually checking if we are binding to an +existing action. + +tdc results: +1..29 +ok 1 9784 - Add valid sample action with mandatory arguments +ok 2 5c91 - Add valid sample action with mandatory arguments and continue control action +ok 3 334b - Add valid sample action with mandatory arguments and drop control action +ok 4 da69 - Add valid sample action with mandatory arguments and reclassify control action +ok 5 13ce - Add valid sample action with mandatory arguments and pipe control action +ok 6 1886 - Add valid sample action with mandatory arguments and jump control action +ok 7 7571 - Add sample action with invalid rate +ok 8 b6d4 - Add sample action with mandatory arguments and invalid control action +ok 9 a874 - Add invalid sample action without mandatory arguments +ok 10 ac01 - Add invalid sample action without mandatory argument rate +ok 11 4203 - Add invalid sample action without mandatory argument group +ok 12 14a7 - Add invalid sample action without mandatory argument group +ok 13 8f2e - Add valid sample action with trunc argument +ok 14 45f8 - Add sample action with maximum rate argument +ok 15 ad0c - Add sample action with maximum trunc argument +ok 16 83a9 - Add sample action with maximum group argument +ok 17 ed27 - Add sample action with invalid rate argument +ok 18 2eae - Add sample action with invalid group argument +ok 19 6ff3 - Add sample action with invalid trunc size +ok 20 2b2a - Add sample action with invalid index +ok 21 dee2 - Add sample action with maximum allowed index +ok 22 560e - Add sample action with cookie +ok 23 704a - Replace existing sample action with new rate argument +ok 24 60eb - Replace existing sample action with new group argument +ok 25 2cce - Replace existing sample action with new trunc argument +ok 26 59d1 - Replace existing sample action with new control argument +ok 27 0a6e - Replace sample action with invalid goto chain control +ok 28 3872 - Delete sample action with valid index +ok 29 a394 - Delete sample action with invalid index + +Fixes: 5c5670fae430 ("net/sched: Introduce sample tc action") +Reviewed-by: Jamal Hadi Salim +Signed-off-by: Pedro Tammela +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/sched/act_sample.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c +index 214f4efdd9920..909a685b91621 100644 +--- a/net/sched/act_sample.c ++++ b/net/sched/act_sample.c +@@ -54,8 +54,8 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, + sample_policy, NULL); + if (ret < 0) + return ret; +- if (!tb[TCA_SAMPLE_PARMS] || !tb[TCA_SAMPLE_RATE] || +- !tb[TCA_SAMPLE_PSAMPLE_GROUP]) ++ ++ if (!tb[TCA_SAMPLE_PARMS]) + return -EINVAL; + + parm = nla_data(tb[TCA_SAMPLE_PARMS]); +@@ -79,6 +79,13 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, + tcf_idr_release(*a, bind); + return -EEXIST; + } ++ ++ if (!tb[TCA_SAMPLE_RATE] || !tb[TCA_SAMPLE_PSAMPLE_GROUP]) { ++ NL_SET_ERR_MSG(extack, "sample rate and group are required"); ++ err = -EINVAL; ++ goto release_idr; ++ } ++ + err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack); + if (err < 0) + goto release_idr; +-- +2.39.2 + diff --git a/queue-5.4/netfilter-ctnetlink-fix-possible-refcount-leak-in-ct.patch b/queue-5.4/netfilter-ctnetlink-fix-possible-refcount-leak-in-ct.patch new file mode 100644 index 00000000000..be0ff1cd52c --- /dev/null +++ b/queue-5.4/netfilter-ctnetlink-fix-possible-refcount-leak-in-ct.patch @@ -0,0 +1,47 @@ +From 1f55fe0ea27502e358baa4fcd7525f1f92b66d38 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Feb 2023 15:17:30 +0800 +Subject: netfilter: ctnetlink: fix possible refcount leak in + ctnetlink_create_conntrack() + +From: Hangyu Hua + +[ Upstream commit ac4893980bbe79ce383daf9a0885666a30fe4c83 ] + +nf_ct_put() needs to be called to put the refcount got by +nf_conntrack_find_get() to avoid refcount leak when +nf_conntrack_hash_check_insert() fails. + +Fixes: 7d367e06688d ("netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2)") +Signed-off-by: Hangyu Hua +Acked-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_conntrack_netlink.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c +index bc6f0c8874f81..4747daf901e71 100644 +--- a/net/netfilter/nf_conntrack_netlink.c ++++ b/net/netfilter/nf_conntrack_netlink.c +@@ -2086,12 +2086,15 @@ ctnetlink_create_conntrack(struct net *net, + + err = nf_conntrack_hash_check_insert(ct); + if (err < 0) +- goto err2; ++ goto err3; + + rcu_read_unlock(); + + return ct; + ++err3: ++ if (ct->master) ++ nf_ct_put(ct->master); + err2: + rcu_read_unlock(); + err1: +-- +2.39.2 + diff --git a/queue-5.4/nfc-fix-memory-leak-of-se_io-context-in-nfc_genl_se_.patch b/queue-5.4/nfc-fix-memory-leak-of-se_io-context-in-nfc_genl_se_.patch new file mode 100644 index 00000000000..f071956604f --- /dev/null +++ b/queue-5.4/nfc-fix-memory-leak-of-se_io-context-in-nfc_genl_se_.patch @@ -0,0 +1,85 @@ +From 83b916dc93af863f32b161b69074e2093c4af3f9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 25 Feb 2023 13:56:14 +0300 +Subject: nfc: fix memory leak of se_io context in nfc_genl_se_io + +From: Fedor Pchelkin + +[ Upstream commit 25ff6f8a5a3b8dc48e8abda6f013e8cc4b14ffea ] + +The callback context for sending/receiving APDUs to/from the selected +secure element is allocated inside nfc_genl_se_io and supposed to be +eventually freed in se_io_cb callback function. However, there are several +error paths where the bwi_timer is not charged to call se_io_cb later, and +the cb_context is leaked. + +The patch proposes to free the cb_context explicitly on those error paths. + +At the moment we can't simply check 'dev->ops->se_io()' return value as it +may be negative in both cases: when the timer was charged and was not. + +Fixes: 5ce3f32b5264 ("NFC: netlink: SE API implementation") +Reported-by: syzbot+df64c0a2e8d68e78a4fa@syzkaller.appspotmail.com +Signed-off-by: Fedor Pchelkin +Signed-off-by: Alexey Khoroshilov +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/nfc/st-nci/se.c | 6 ++++++ + drivers/nfc/st21nfca/se.c | 6 ++++++ + net/nfc/netlink.c | 4 ++++ + 3 files changed, 16 insertions(+) + +diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c +index 0cd70cd680dc7..17793f6888e1f 100644 +--- a/drivers/nfc/st-nci/se.c ++++ b/drivers/nfc/st-nci/se.c +@@ -665,6 +665,12 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx, + ST_NCI_EVT_TRANSMIT_DATA, apdu, + apdu_length); + default: ++ /* Need to free cb_context here as at the moment we can't ++ * clearly indicate to the caller if the callback function ++ * would be called (and free it) or not. In both cases a ++ * negative value may be returned to the caller. ++ */ ++ kfree(cb_context); + return -ENODEV; + } + } +diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c +index d416365042462..6a1d3b2752fbf 100644 +--- a/drivers/nfc/st21nfca/se.c ++++ b/drivers/nfc/st21nfca/se.c +@@ -236,6 +236,12 @@ int st21nfca_hci_se_io(struct nfc_hci_dev *hdev, u32 se_idx, + ST21NFCA_EVT_TRANSMIT_DATA, + apdu, apdu_length); + default: ++ /* Need to free cb_context here as at the moment we can't ++ * clearly indicate to the caller if the callback function ++ * would be called (and free it) or not. In both cases a ++ * negative value may be returned to the caller. ++ */ ++ kfree(cb_context); + return -ENODEV; + } + } +diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c +index b53d5eb868647..c4c57830e9636 100644 +--- a/net/nfc/netlink.c ++++ b/net/nfc/netlink.c +@@ -1450,7 +1450,11 @@ static int nfc_se_io(struct nfc_dev *dev, u32 se_idx, + rc = dev->ops->se_io(dev, se_idx, apdu, + apdu_length, cb, cb_context); + ++ device_unlock(&dev->dev); ++ return rc; ++ + error: ++ kfree(cb_context); + device_unlock(&dev->dev); + return rc; + } +-- +2.39.2 + diff --git a/queue-5.4/parport_pc-set-up-mode-and-ecr-masks-for-oxford-semi.patch b/queue-5.4/parport_pc-set-up-mode-and-ecr-masks-for-oxford-semi.patch new file mode 100644 index 00000000000..37a724d989b --- /dev/null +++ b/queue-5.4/parport_pc-set-up-mode-and-ecr-masks-for-oxford-semi.patch @@ -0,0 +1,140 @@ +From 1d4aed1e3bc9c59bf95dcbc8479b32234e423377 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 8 Jan 2023 21:56:55 +0000 +Subject: parport_pc: Set up mode and ECR masks for Oxford Semiconductor + devices + +From: Maciej W. Rozycki + +[ Upstream commit c087df8d1e7dc2e764d11234d84b5af46d500f16 ] + +No Oxford Semiconductor PCI or PCIe parallel port device supports the +Parallel Port FIFO mode. All support the PS/2 Parallel Port mode and +the Enhanced Parallel Port mode via the ECR register. The original 5V +PCI OX16PCI954 device does not support the Extended Capabilities Port +mode, the Test mode or the Configuration mode, but all the other OxSemi +devices do, including in particular the 3.3V PCI OXmPCI954 device and +the universal voltage PCI OXuPCI954 device. All the unsupported modes +are marked reserved in the relevant datasheets. + +Accordingly enable the `base_hi' BAR for the 954 devices to enable PS2 +and EPP mode support via the ECR register, however mask the COMPAT mode +and, until we have a way to determine what chip variant it is that we +poke at, also the ECP mode, and mask the COMPAT mode only for all the +remaining OxSemi devices, fixing errors like: + +parport0: FIFO is stuck +FIFO write timed out + +and a non-functional port when the Parallel Port FIFO mode is selected. + +Complementing the fix apply an ECR mask for all these devices, which are +documented to only permit writing to the mode field of the ECR register +with a bit pattern of 00001 required to be written to bits 4:0 on mode +field writes. No nFault or service interrupts are implemented, which +will therefore never have to be enabled, though bit 2 does report the +FIFO threshold status to be polled for in the ECP mode where supported. + +We have a documented case of writing 1 to bit 2 causing a lock-up with +at least one OX12PCI840 device (from old drivers/parport/ChangeLog): + +2001-10-10 Tim Waugh + + * parport_pc.c: Support for OX12PCI840 PCI card (reported by + mk@daveg.com). Lock-ups diagnosed by Ronnie Arosa (and now we + just don't trust its ECR). + +which commit adbd321a17cc ("parport_pc: add base_hi BAR for oxsemi_840") +must have broken and by applying an ECR mask here we prevent the lock-up +from triggering. This could have been the reason for requiring 00001 to +be written to bits 4:0 of ECR. + +Update the inline comment accordingly; it has come from Linux 2.4.12 +back in 2001 and predates the introduction of OXmPCI954 and OXuPCI954 +devices that do support ECP. + +References: + +[1] "OX16PCI954 Integrated Quad UART and PCI interface", Oxford + Semiconductor Ltd., Data Sheet Revision 1.3, Feb. 1999, Chapter 9 + "Bidirectional Parallel Port", pp. 53-55 + +[2] "OX16PCI952 Data Sheet, Integrated High Performance Dual UARTs, + Parallel Port and 5.0v PCI interface", Oxford Semiconductor Ltd., + DS_B008A_00, Datasheet rev 1.1, June 2001, Chapter 8 "Bi-directional + Parallel Port", pp. 52-56 + +[3] "OXmPCI954 DATA SHEET Integrated High Performance Quad UARTs, 8-bit + Local Bus/Parallel Port. 3.3v PCI/miniPCI interface.", Oxford + Semiconductor Ltd., DS-0019, June 2005, Chapter 10 "Bidirectional + Parallel Port", pp. 86-90 + +[4] "OXmPCI952 Data Sheet, Integrated High Performance Dual UARTs, 8-bit + Local Bus/Parallel Port. 3.3v PCI/miniPCI interface.", Oxford + Semiconductor Ltd., DS-0020, June 2005, Chapter 8 "Bidirectional + Parallel Port", pp. 73-77 + +[5] "OX12PCI840 Integrated Parallel Port and PCI interface", Oxford + Semiconductor Ltd., DS-0021, Jun 2005, Chapter 5 "Bi-directional + Parallel Port", pp. 18-21 + +[6] "OXPCIe952 PCI Express Bridge to Dual Serial & Parallel Port", + Oxford Semiconductor, Inc., DS-0046, Mar 06 08, Chapter "Parallel + Port Function", pp. 59-62 + +[7] "OXPCIe840 PCI Express Bridge to Parallel Port", Oxford + Semiconductor, Inc., DS-0049, Mar 06 08, Chapter "Parallel Port + Function", pp. 15-18 + +[8] "OXuPCI954 Data Sheet, Integrated High Performance Quad UARTs, 8-bit + Local Bus/Parallel Port, 3.3 V and 5 V (Universal Voltage) PCI + Interface.", Oxford Semiconductor, Inc., DS-0058, 26 Jan 2009, + Chapter 8 "Bidirectional Parallel Port", pp. 62-65 + +[9] "OXuPCI952 Data Sheet, Integrated High Performance Dual UARTs, 8-bit + Local Bus/Parallel Port, 3.3 V and 5.0 V Universal Voltage PCI + Interface.", Oxford Semiconductor, Inc., DS-0059, Sep 2007, Chapter + 8 "Bidirectional Parallel Port", pp. 61-64 + +Signed-off-by: Maciej W. Rozycki +Signed-off-by: Sudip Mukherjee +Link: https://lore.kernel.org/r/20230108215656.6433-6-sudipm.mukherjee@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/parport/parport_pc.c | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c +index 3bc0027b7844b..6ebf2a3e9f04d 100644 +--- a/drivers/parport/parport_pc.c ++++ b/drivers/parport/parport_pc.c +@@ -2692,12 +2692,19 @@ static struct parport_pc_pci { + /* titan_010l */ { 1, { { 3, -1 }, } }, + /* avlab_1p */ { 1, { { 0, 1}, } }, + /* avlab_2p */ { 2, { { 0, 1}, { 2, 3 },} }, +- /* The Oxford Semi cards are unusual: 954 doesn't support ECP, +- * and 840 locks up if you write 1 to bit 2! */ +- /* oxsemi_952 */ { 1, { { 0, 1 }, } }, +- /* oxsemi_954 */ { 1, { { 0, -1 }, } }, +- /* oxsemi_840 */ { 1, { { 0, 1 }, } }, +- /* oxsemi_pcie_pport */ { 1, { { 0, 1 }, } }, ++ /* The Oxford Semi cards are unusual: older variants of 954 don't ++ * support ECP, and 840 locks up if you write 1 to bit 2! None ++ * implement nFault or service interrupts and all require 00001 ++ * bit pattern to be used for bits 4:0 with ECR writes. */ ++ /* oxsemi_952 */ { 1, { { 0, 1 }, }, ++ PARPORT_MODE_COMPAT, ECR_MODE_MASK }, ++ /* oxsemi_954 */ { 1, { { 0, 1 }, }, ++ PARPORT_MODE_ECP | ++ PARPORT_MODE_COMPAT, ECR_MODE_MASK }, ++ /* oxsemi_840 */ { 1, { { 0, 1 }, }, ++ PARPORT_MODE_COMPAT, ECR_MODE_MASK }, ++ /* oxsemi_pcie_pport */ { 1, { { 0, 1 }, }, ++ PARPORT_MODE_COMPAT, ECR_MODE_MASK }, + /* aks_0100 */ { 1, { { 0, -1 }, } }, + /* mobility_pp */ { 1, { { 0, 1 }, } }, + +-- +2.39.2 + diff --git a/queue-5.4/pci-add-acs-quirk-for-wangxun-nics.patch b/queue-5.4/pci-add-acs-quirk-for-wangxun-nics.patch new file mode 100644 index 00000000000..35f24f59f49 --- /dev/null +++ b/queue-5.4/pci-add-acs-quirk-for-wangxun-nics.patch @@ -0,0 +1,81 @@ +From 166ca3f716194f0709d9870695112311c682899e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Feb 2023 18:24:19 +0800 +Subject: PCI: Add ACS quirk for Wangxun NICs + +From: Mengyuan Lou + +[ Upstream commit a2b9b123ccac913e9f9b80337d687a2fe786a634 ] + +Wangxun has verified there is no peer-to-peer between functions for the +below selection of SFxxx, RP1000 and RP2000 NICS. They may be +multi-function devices, but the hardware does not advertise ACS capability. + +Add an ACS quirk for these devices so the functions can be in independent +IOMMU groups. + +Link: https://lore.kernel.org/r/20230207102419.44326-1-mengyuanlou@net-swift.com +Signed-off-by: Mengyuan Lou +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/quirks.c | 22 ++++++++++++++++++++++ + include/linux/pci_ids.h | 2 ++ + 2 files changed, 24 insertions(+) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index b5a384f0a6844..449d4ed611a68 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -4843,6 +4843,26 @@ static int pci_quirk_brcm_acs(struct pci_dev *dev, u16 acs_flags) + PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); + } + ++/* ++ * Wangxun 10G/1G NICs have no ACS capability, and on multi-function ++ * devices, peer-to-peer transactions are not be used between the functions. ++ * So add an ACS quirk for below devices to isolate functions. ++ * SFxxx 1G NICs(em). ++ * RP1000/RP2000 10G NICs(sp). ++ */ ++static int pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags) ++{ ++ switch (dev->device) { ++ case 0x0100 ... 0x010F: ++ case 0x1001: ++ case 0x2001: ++ return pci_acs_ctrl_enabled(acs_flags, ++ PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); ++ } ++ ++ return false; ++} ++ + static const struct pci_dev_acs_enabled { + u16 vendor; + u16 device; +@@ -4988,6 +5008,8 @@ static const struct pci_dev_acs_enabled { + { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs }, + /* Zhaoxin Root/Downstream Ports */ + { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, ++ /* Wangxun nics */ ++ { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, + { 0 } + }; + +diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h +index 526d423740eb2..a31aa3ac4219f 100644 +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -3024,6 +3024,8 @@ + #define PCI_DEVICE_ID_INTEL_VMD_9A0B 0x9a0b + #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 + ++#define PCI_VENDOR_ID_WANGXUN 0x8088 ++ + #define PCI_VENDOR_ID_SCALEMP 0x8686 + #define PCI_DEVICE_ID_SCALEMP_VSMP_CTL 0x1010 + +-- +2.39.2 + diff --git a/queue-5.4/phy-rockchip-typec-fix-unsigned-comparison-with-less.patch b/queue-5.4/phy-rockchip-typec-fix-unsigned-comparison-with-less.patch new file mode 100644 index 00000000000..73469aba1df --- /dev/null +++ b/queue-5.4/phy-rockchip-typec-fix-unsigned-comparison-with-less.patch @@ -0,0 +1,43 @@ +From 9ca6da4035471f73b3226d4eb6e5e3cf03552b70 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Feb 2023 11:57:09 +0800 +Subject: phy: rockchip-typec: Fix unsigned comparison with less than zero + +From: Jiapeng Chong + +[ Upstream commit f765c59c5a72546a2d74a92ae5d0eb0329d8e247 ] + +The dp and ufp are defined as bool type, the return value type of +function extcon_get_state should be int, so the type of dp and ufp +are modified to int. + +./drivers/phy/rockchip/phy-rockchip-typec.c:827:12-14: WARNING: Unsigned expression compared with zero: dp > 0. + +Reported-by: Abaci Robot +Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3962 +Signed-off-by: Jiapeng Chong +Link: https://lore.kernel.org/r/20230213035709.99027-1-jiapeng.chong@linux.alibaba.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/rockchip/phy-rockchip-typec.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c +index 24563160197f5..ba805f1d4f6a8 100644 +--- a/drivers/phy/rockchip/phy-rockchip-typec.c ++++ b/drivers/phy/rockchip/phy-rockchip-typec.c +@@ -808,9 +808,8 @@ static int tcphy_get_mode(struct rockchip_typec_phy *tcphy) + struct extcon_dev *edev = tcphy->extcon; + union extcon_property_value property; + unsigned int id; +- bool ufp, dp; + u8 mode; +- int ret; ++ int ret, ufp, dp; + + if (!edev) + return MODE_DFP_USB; +-- +2.39.2 + diff --git a/queue-5.4/pwm-sifive-always-let-the-first-pwm_apply_state-succ.patch b/queue-5.4/pwm-sifive-always-let-the-first-pwm_apply_state-succ.patch new file mode 100644 index 00000000000..c24d987570b --- /dev/null +++ b/queue-5.4/pwm-sifive-always-let-the-first-pwm_apply_state-succ.patch @@ -0,0 +1,69 @@ +From d6272d22061198a711f730c3f5e6380ead8f6d6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Nov 2022 12:37:24 +0100 +Subject: pwm: sifive: Always let the first pwm_apply_state succeed + +From: Emil Renner Berthing + +[ Upstream commit 334c7b13d38321e47d1a51dba0bef9f4c403ec75 ] + +Commit 2cfe9bbec56ea579135cdd92409fff371841904f added support for the +RGB and green PWM controlled LEDs on the HiFive Unmatched board +managed by the leds-pwm-multicolor and leds-pwm drivers respectively. +All three colours of the RGB LED and the green LED run from different +lines of the same PWM, but with the same period so this works fine when +the LED drivers are loaded one after the other. + +Unfortunately it does expose a race in the PWM driver when both LED +drivers are loaded at roughly the same time. Here is an example: + + | Thread A | Thread B | + | led_pwm_mc_probe | led_pwm_probe | + | devm_fwnode_pwm_get | | + | pwm_sifive_request | | + | ddata->user_count++ | | + | | devm_fwnode_pwm_get | + | | pwm_sifive_request | + | | ddata->user_count++ | + | ... | ... | + | pwm_state_apply | pwm_state_apply | + | pwm_sifive_apply | pwm_sifive_apply | + +Now both calls to pwm_sifive_apply will see that ddata->approx_period, +initially 0, is different from the requested period and the clock needs +to be updated. But since ddata->user_count >= 2 both calls will fail +with -EBUSY, which will then cause both LED drivers to fail to probe. + +Fix it by letting the first call to pwm_sifive_apply update the clock +even when ddata->user_count != 1. + +Fixes: 9e37a53eb051 ("pwm: sifive: Add a driver for SiFive SoC PWM") +Signed-off-by: Emil Renner Berthing +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/pwm/pwm-sifive.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c +index 980ddcdd52953..16c70147ec40e 100644 +--- a/drivers/pwm/pwm-sifive.c ++++ b/drivers/pwm/pwm-sifive.c +@@ -187,7 +187,13 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, + + mutex_lock(&ddata->lock); + if (state->period != ddata->approx_period) { +- if (ddata->user_count != 1) { ++ /* ++ * Don't let a 2nd user change the period underneath the 1st user. ++ * However if ddate->approx_period == 0 this is the first time we set ++ * any period, so let whoever gets here first set the period so other ++ * users who agree on the period won't fail. ++ */ ++ if (ddata->user_count != 1 && ddata->approx_period) { + mutex_unlock(&ddata->lock); + ret = -EBUSY; + goto exit; +-- +2.39.2 + diff --git a/queue-5.4/pwm-sifive-reduce-time-the-controller-lock-is-held.patch b/queue-5.4/pwm-sifive-reduce-time-the-controller-lock-is-held.patch new file mode 100644 index 00000000000..10a7902062f --- /dev/null +++ b/queue-5.4/pwm-sifive-reduce-time-the-controller-lock-is-held.patch @@ -0,0 +1,84 @@ +From fe0a2bdbdc0afda3f6e00e7be647054043a39922 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Jul 2022 12:31:25 +0200 +Subject: pwm: sifive: Reduce time the controller lock is held +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Uwe Kleine-König + +[ Upstream commit 0f02f491b786143f08eb19840f1cf4f12aec6dee ] + +The lock is only to serialize access and update to user_count and +approx_period between different PWMs served by the same pwm_chip. +So the lock needs only to be taken during the check if the (chip global) +period can and/or needs to be changed. + +Signed-off-by: Uwe Kleine-König +Tested-by: Emil Renner Berthing +Signed-off-by: Thierry Reding +Stable-dep-of: 334c7b13d383 ("pwm: sifive: Always let the first pwm_apply_state succeed") +Signed-off-by: Sasha Levin +--- + drivers/pwm/pwm-sifive.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c +index 538297ef82558..980ddcdd52953 100644 +--- a/drivers/pwm/pwm-sifive.c ++++ b/drivers/pwm/pwm-sifive.c +@@ -43,7 +43,7 @@ + + struct pwm_sifive_ddata { + struct pwm_chip chip; +- struct mutex lock; /* lock to protect user_count */ ++ struct mutex lock; /* lock to protect user_count and approx_period */ + struct notifier_block notifier; + struct clk *clk; + void __iomem *regs; +@@ -78,6 +78,7 @@ static void pwm_sifive_free(struct pwm_chip *chip, struct pwm_device *pwm) + mutex_unlock(&ddata->lock); + } + ++/* Called holding ddata->lock */ + static void pwm_sifive_update_clock(struct pwm_sifive_ddata *ddata, + unsigned long rate) + { +@@ -166,7 +167,6 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, + return ret; + } + +- mutex_lock(&ddata->lock); + cur_state = pwm->state; + enabled = cur_state.enabled; + +@@ -185,14 +185,17 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, + /* The hardware cannot generate a 100% duty cycle */ + frac = min(frac, (1U << PWM_SIFIVE_CMPWIDTH) - 1); + ++ mutex_lock(&ddata->lock); + if (state->period != ddata->approx_period) { + if (ddata->user_count != 1) { ++ mutex_unlock(&ddata->lock); + ret = -EBUSY; + goto exit; + } + ddata->approx_period = state->period; + pwm_sifive_update_clock(ddata, clk_get_rate(ddata->clk)); + } ++ mutex_unlock(&ddata->lock); + + writel(frac, ddata->regs + PWM_SIFIVE_PWMCMP0 + + pwm->hwpwm * PWM_SIFIVE_SIZE_PWMCMP); +@@ -202,7 +205,6 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, + + exit: + clk_disable(ddata->clk); +- mutex_unlock(&ddata->lock); + return ret; + } + +-- +2.39.2 + diff --git a/queue-5.4/pwm-stm32-lp-fix-the-check-on-arr-and-cmp-registers-.patch b/queue-5.4/pwm-stm32-lp-fix-the-check-on-arr-and-cmp-registers-.patch new file mode 100644 index 00000000000..b468eb53d1b --- /dev/null +++ b/queue-5.4/pwm-stm32-lp-fix-the-check-on-arr-and-cmp-registers-.patch @@ -0,0 +1,44 @@ +From 783b9c4a7aecc2cbdc3b22cd94fb5cb03eff39c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Nov 2022 14:36:52 +0100 +Subject: pwm: stm32-lp: fix the check on arr and cmp registers update +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Fabrice Gasnier + +[ Upstream commit 3066bc2d58be31275afb51a589668f265e419c37 ] + +The ARR (auto reload register) and CMP (compare) registers are +successively written. The status bits to check the update of these +registers are polled together with regmap_read_poll_timeout(). +The condition to end the loop may become true, even if one of the +register isn't correctly updated. +So ensure both status bits are set before clearing them. + +Fixes: e70a540b4e02 ("pwm: Add STM32 LPTimer PWM driver") +Signed-off-by: Fabrice Gasnier +Acked-by: Uwe Kleine-König +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/pwm/pwm-stm32-lp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pwm/pwm-stm32-lp.c b/drivers/pwm/pwm-stm32-lp.c +index 05bb1f95a7739..20657c649c65e 100644 +--- a/drivers/pwm/pwm-stm32-lp.c ++++ b/drivers/pwm/pwm-stm32-lp.c +@@ -127,7 +127,7 @@ static int stm32_pwm_lp_apply(struct pwm_chip *chip, struct pwm_device *pwm, + + /* ensure CMP & ARR registers are properly written */ + ret = regmap_read_poll_timeout(priv->regmap, STM32_LPTIM_ISR, val, +- (val & STM32_LPTIM_CMPOK_ARROK), ++ (val & STM32_LPTIM_CMPOK_ARROK) == STM32_LPTIM_CMPOK_ARROK, + 100, 1000); + if (ret) { + dev_err(priv->chip.dev, "ARR/CMP registers write issue\n"); +-- +2.39.2 + diff --git a/queue-5.4/rtc-sun6i-always-export-the-internal-oscillator.patch b/queue-5.4/rtc-sun6i-always-export-the-internal-oscillator.patch new file mode 100644 index 00000000000..b18f3280edc --- /dev/null +++ b/queue-5.4/rtc-sun6i-always-export-the-internal-oscillator.patch @@ -0,0 +1,83 @@ +From 7eae3cda567f4d66c2fd36329c9b0307e5cbcb53 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Dec 2022 15:53:19 -0600 +Subject: rtc: sun6i: Always export the internal oscillator + +From: Samuel Holland + +[ Upstream commit 344f4030f6c50a9db2d03021884c4bf36191b53a ] + +On all variants of the hardware, the internal oscillator is one possible +parent for the AR100 clock. It needs to be exported so we can model that +relationship correctly in the devicetree. + +Fixes: c56afc1844d6 ("rtc: sun6i: Expose internal oscillator through device tree") +Signed-off-by: Samuel Holland +Acked-by: Jernej Skrabec +Link: https://lore.kernel.org/r/20221229215319.14145-1-samuel@sholland.org +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-sun6i.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c +index b13af0368ef61..5bef4148c623e 100644 +--- a/drivers/rtc/rtc-sun6i.c ++++ b/drivers/rtc/rtc-sun6i.c +@@ -129,7 +129,6 @@ struct sun6i_rtc_clk_data { + unsigned int fixed_prescaler : 16; + unsigned int has_prescaler : 1; + unsigned int has_out_clk : 1; +- unsigned int export_iosc : 1; + unsigned int has_losc_en : 1; + unsigned int has_auto_swt : 1; + }; +@@ -262,10 +261,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, + /* Yes, I know, this is ugly. */ + sun6i_rtc = rtc; + +- /* Only read IOSC name from device tree if it is exported */ +- if (rtc->data->export_iosc) +- of_property_read_string_index(node, "clock-output-names", 2, +- &iosc_name); ++ of_property_read_string_index(node, "clock-output-names", 2, ++ &iosc_name); + + rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL, + iosc_name, +@@ -306,13 +303,10 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, + goto err_register; + } + +- clk_data->num = 2; ++ clk_data->num = 3; + clk_data->hws[0] = &rtc->hw; + clk_data->hws[1] = __clk_get_hw(rtc->ext_losc); +- if (rtc->data->export_iosc) { +- clk_data->hws[2] = rtc->int_osc; +- clk_data->num = 3; +- } ++ clk_data->hws[2] = rtc->int_osc; + of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); + return; + +@@ -352,7 +346,6 @@ static const struct sun6i_rtc_clk_data sun8i_h3_rtc_data = { + .fixed_prescaler = 32, + .has_prescaler = 1, + .has_out_clk = 1, +- .export_iosc = 1, + }; + + static void __init sun8i_h3_rtc_clk_init(struct device_node *node) +@@ -370,7 +363,6 @@ static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = { + .fixed_prescaler = 32, + .has_prescaler = 1, + .has_out_clk = 1, +- .export_iosc = 1, + .has_losc_en = 1, + .has_auto_swt = 1, + }; +-- +2.39.2 + diff --git a/queue-5.4/rtc-sun6i-make-external-32k-oscillator-optional.patch b/queue-5.4/rtc-sun6i-make-external-32k-oscillator-optional.patch new file mode 100644 index 00000000000..f82cf829a44 --- /dev/null +++ b/queue-5.4/rtc-sun6i-make-external-32k-oscillator-optional.patch @@ -0,0 +1,78 @@ +From 53ad9df0bb63547ffed19d1caa75e9f35b06d7d9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 8 Mar 2020 14:58:48 +0100 +Subject: rtc: sun6i: Make external 32k oscillator optional + +From: Jernej Skrabec + +[ Upstream commit ec98a87509f40324807dc179a7e3163d40709eba ] + +Some boards, like OrangePi PC2 (H5), OrangePi Plus 2E (H3) and Tanix TX6 +(H6) don't have external 32kHz oscillator. Till H6, it didn't really +matter if external oscillator was enabled because HW detected error and +fall back to internal one. H6 has same functionality but it's the first +SoC which have "auto switch bypass" bit documented and always enabled in +driver. This prevents RTC to work correctly if external crystal is not +present on board. There are other side effects - all peripherals which +depends on this clock also don't work (HDMI CEC for example). + +Make clocks property optional. If it is present, select external +oscillator. If not, stay on internal. + +Signed-off-by: Jernej Skrabec +Acked-by: Maxime Ripard +Link: https://lore.kernel.org/r/20200308135849.106333-2-jernej.skrabec@siol.net +Signed-off-by: Alexandre Belloni +Stable-dep-of: 344f4030f6c5 ("rtc: sun6i: Always export the internal oscillator") +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-sun6i.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c +index c41bc8084d7cc..b13af0368ef61 100644 +--- a/drivers/rtc/rtc-sun6i.c ++++ b/drivers/rtc/rtc-sun6i.c +@@ -251,19 +251,17 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, + writel(reg, rtc->base + SUN6I_LOSC_CTRL); + } + +- /* Switch to the external, more precise, oscillator */ +- reg |= SUN6I_LOSC_CTRL_EXT_OSC; +- if (rtc->data->has_losc_en) +- reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN; ++ /* Switch to the external, more precise, oscillator, if present */ ++ if (of_get_property(node, "clocks", NULL)) { ++ reg |= SUN6I_LOSC_CTRL_EXT_OSC; ++ if (rtc->data->has_losc_en) ++ reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN; ++ } + writel(reg, rtc->base + SUN6I_LOSC_CTRL); + + /* Yes, I know, this is ugly. */ + sun6i_rtc = rtc; + +- /* Deal with old DTs */ +- if (!of_get_property(node, "clocks", NULL)) +- goto err; +- + /* Only read IOSC name from device tree if it is exported */ + if (rtc->data->export_iosc) + of_property_read_string_index(node, "clock-output-names", 2, +@@ -280,11 +278,13 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, + } + + parents[0] = clk_hw_get_name(rtc->int_osc); ++ /* If there is no external oscillator, this will be NULL and ... */ + parents[1] = of_clk_get_parent_name(node, 0); + + rtc->hw.init = &init; + + init.parent_names = parents; ++ /* ... number of clock parents will be 1. */ + init.num_parents = of_clk_get_parent_count(node) + 1; + of_property_read_string_index(node, "clock-output-names", 0, + &init.name); +-- +2.39.2 + diff --git a/queue-5.4/scsi-ipr-work-around-fortify-string-warning.patch b/queue-5.4/scsi-ipr-work-around-fortify-string-warning.patch new file mode 100644 index 00000000000..a8124a1f984 --- /dev/null +++ b/queue-5.4/scsi-ipr-work-around-fortify-string-warning.patch @@ -0,0 +1,114 @@ +From 10c740e184193270e03d732165362c2cd053d65f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Feb 2023 14:28:08 +0100 +Subject: scsi: ipr: Work around fortify-string warning + +From: Arnd Bergmann + +[ Upstream commit ee4e7dfe4ffc9ca50c6875757bd119abfe22b5c5 ] + +The ipr_log_vpd_compact() function triggers a fortified memcpy() warning +about a potential string overflow with all versions of clang: + +In file included from drivers/scsi/ipr.c:43: +In file included from include/linux/string.h:254: +include/linux/fortify-string.h:520:4: error: call to '__write_overflow_field' declared with 'warning' attribute: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror,-Wattribute-warning] + __write_overflow_field(p_size_field, size); + ^ +include/linux/fortify-string.h:520:4: error: call to '__write_overflow_field' declared with 'warning' attribute: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror,-Wattribute-warning] +2 errors generated. + +I don't see anything actually wrong with the function, but this is the only +instance I can reproduce of the fortification going wrong in the kernel at +the moment, so the easiest solution may be to rewrite the function into +something that does not trigger the warning. + +Instead of having a combined buffer for vendor/device/serial strings, use +three separate local variables and just truncate the whitespace +individually. + +Link: https://lore.kernel.org/r/20230214132831.2118392-1-arnd@kernel.org +Cc: Kees Cook +Fixes: 8cf093e275d0 ("[SCSI] ipr: Improved dual adapter errors") +Signed-off-by: Arnd Bergmann +Reviewed-by: Damien Le Moal +Reviewed-by: Kees Cook +Acked-by: Brian King +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ipr.c | 41 +++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) + +diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c +index a42837340edfc..205ab65c3e28e 100644 +--- a/drivers/scsi/ipr.c ++++ b/drivers/scsi/ipr.c +@@ -1517,23 +1517,22 @@ static void ipr_process_ccn(struct ipr_cmnd *ipr_cmd) + } + + /** +- * strip_and_pad_whitespace - Strip and pad trailing whitespace. +- * @i: index into buffer +- * @buf: string to modify ++ * strip_whitespace - Strip and pad trailing whitespace. ++ * @i: size of buffer ++ * @buf: string to modify + * +- * This function will strip all trailing whitespace, pad the end +- * of the string with a single space, and NULL terminate the string. ++ * This function will strip all trailing whitespace and ++ * NUL terminate the string. + * +- * Return value: +- * new length of string + **/ +-static int strip_and_pad_whitespace(int i, char *buf) ++static void strip_whitespace(int i, char *buf) + { ++ if (i < 1) ++ return; ++ i--; + while (i && buf[i] == ' ') + i--; +- buf[i+1] = ' '; +- buf[i+2] = '\0'; +- return i + 2; ++ buf[i+1] = '\0'; + } + + /** +@@ -1548,19 +1547,21 @@ static int strip_and_pad_whitespace(int i, char *buf) + static void ipr_log_vpd_compact(char *prefix, struct ipr_hostrcb *hostrcb, + struct ipr_vpd *vpd) + { +- char buffer[IPR_VENDOR_ID_LEN + IPR_PROD_ID_LEN + IPR_SERIAL_NUM_LEN + 3]; +- int i = 0; ++ char vendor_id[IPR_VENDOR_ID_LEN + 1]; ++ char product_id[IPR_PROD_ID_LEN + 1]; ++ char sn[IPR_SERIAL_NUM_LEN + 1]; + +- memcpy(buffer, vpd->vpids.vendor_id, IPR_VENDOR_ID_LEN); +- i = strip_and_pad_whitespace(IPR_VENDOR_ID_LEN - 1, buffer); ++ memcpy(vendor_id, vpd->vpids.vendor_id, IPR_VENDOR_ID_LEN); ++ strip_whitespace(IPR_VENDOR_ID_LEN, vendor_id); + +- memcpy(&buffer[i], vpd->vpids.product_id, IPR_PROD_ID_LEN); +- i = strip_and_pad_whitespace(i + IPR_PROD_ID_LEN - 1, buffer); ++ memcpy(product_id, vpd->vpids.product_id, IPR_PROD_ID_LEN); ++ strip_whitespace(IPR_PROD_ID_LEN, product_id); + +- memcpy(&buffer[i], vpd->sn, IPR_SERIAL_NUM_LEN); +- buffer[IPR_SERIAL_NUM_LEN + i] = '\0'; ++ memcpy(sn, vpd->sn, IPR_SERIAL_NUM_LEN); ++ strip_whitespace(IPR_SERIAL_NUM_LEN, sn); + +- ipr_hcam_err(hostrcb, "%s VPID/SN: %s\n", prefix, buffer); ++ ipr_hcam_err(hostrcb, "%s VPID/SN: %s %s %s\n", prefix, ++ vendor_id, product_id, sn); + } + + /** +-- +2.39.2 + diff --git a/queue-5.4/sctp-add-a-refcnt-in-sctp_stream_priorities-to-avoid.patch b/queue-5.4/sctp-add-a-refcnt-in-sctp_stream_priorities-to-avoid.patch new file mode 100644 index 00000000000..9cdb7b33f01 --- /dev/null +++ b/queue-5.4/sctp-add-a-refcnt-in-sctp_stream_priorities-to-avoid.patch @@ -0,0 +1,166 @@ +From 0da1fbfb33d87c3907cb788aca6971be52239332 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Feb 2023 12:07:21 -0500 +Subject: sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop + +From: Xin Long + +[ Upstream commit 68ba44639537de6f91fe32783766322d41848127 ] + +With this refcnt added in sctp_stream_priorities, we don't need to +traverse all streams to check if the prio is used by other streams +when freeing one stream's prio in sctp_sched_prio_free_sid(). This +can avoid a nested loop (up to 65535 * 65535), which may cause a +stuck as Ying reported: + + watchdog: BUG: soft lockup - CPU#23 stuck for 26s! [ksoftirqd/23:136] + Call Trace: + + sctp_sched_prio_free_sid+0xab/0x100 [sctp] + sctp_stream_free_ext+0x64/0xa0 [sctp] + sctp_stream_free+0x31/0x50 [sctp] + sctp_association_free+0xa5/0x200 [sctp] + +Note that it doesn't need to use refcount_t type for this counter, +as its accessing is always protected under the sock lock. + +v1->v2: + - add a check in sctp_sched_prio_set to avoid the possible prio_head + refcnt overflow. + +Fixes: 9ed7bfc79542 ("sctp: fix memory leak in sctp_stream_outq_migrate()") +Reported-by: Ying Xu +Acked-by: Marcelo Ricardo Leitner +Signed-off-by: Xin Long +Link: https://lore.kernel.org/r/825eb0c905cb864991eba335f4a2b780e543f06b.1677085641.git.lucien.xin@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/net/sctp/structs.h | 1 + + net/sctp/stream_sched_prio.c | 52 +++++++++++++++--------------------- + 2 files changed, 22 insertions(+), 31 deletions(-) + +diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h +index cb05e503c9cd1..48cbf3352042f 100644 +--- a/include/net/sctp/structs.h ++++ b/include/net/sctp/structs.h +@@ -1400,6 +1400,7 @@ struct sctp_stream_priorities { + /* The next stream stream in line */ + struct sctp_stream_out_ext *next; + __u16 prio; ++ __u16 users; + }; + + struct sctp_stream_out_ext { +diff --git a/net/sctp/stream_sched_prio.c b/net/sctp/stream_sched_prio.c +index 4fc9f2923ed11..7dd9f8b387cca 100644 +--- a/net/sctp/stream_sched_prio.c ++++ b/net/sctp/stream_sched_prio.c +@@ -25,6 +25,18 @@ + + static void sctp_sched_prio_unsched_all(struct sctp_stream *stream); + ++static struct sctp_stream_priorities *sctp_sched_prio_head_get(struct sctp_stream_priorities *p) ++{ ++ p->users++; ++ return p; ++} ++ ++static void sctp_sched_prio_head_put(struct sctp_stream_priorities *p) ++{ ++ if (p && --p->users == 0) ++ kfree(p); ++} ++ + static struct sctp_stream_priorities *sctp_sched_prio_new_head( + struct sctp_stream *stream, int prio, gfp_t gfp) + { +@@ -38,6 +50,7 @@ static struct sctp_stream_priorities *sctp_sched_prio_new_head( + INIT_LIST_HEAD(&p->active); + p->next = NULL; + p->prio = prio; ++ p->users = 1; + + return p; + } +@@ -53,7 +66,7 @@ static struct sctp_stream_priorities *sctp_sched_prio_get_head( + */ + list_for_each_entry(p, &stream->prio_list, prio_sched) { + if (p->prio == prio) +- return p; ++ return sctp_sched_prio_head_get(p); + if (p->prio > prio) + break; + } +@@ -70,7 +83,7 @@ static struct sctp_stream_priorities *sctp_sched_prio_get_head( + */ + break; + if (p->prio == prio) +- return p; ++ return sctp_sched_prio_head_get(p); + } + + /* If not even there, allocate a new one. */ +@@ -154,32 +167,21 @@ static int sctp_sched_prio_set(struct sctp_stream *stream, __u16 sid, + struct sctp_stream_out_ext *soute = sout->ext; + struct sctp_stream_priorities *prio_head, *old; + bool reschedule = false; +- int i; ++ ++ old = soute->prio_head; ++ if (old && old->prio == prio) ++ return 0; + + prio_head = sctp_sched_prio_get_head(stream, prio, gfp); + if (!prio_head) + return -ENOMEM; + + reschedule = sctp_sched_prio_unsched(soute); +- old = soute->prio_head; + soute->prio_head = prio_head; + if (reschedule) + sctp_sched_prio_sched(stream, soute); + +- if (!old) +- /* Happens when we set the priority for the first time */ +- return 0; +- +- for (i = 0; i < stream->outcnt; i++) { +- soute = SCTP_SO(stream, i)->ext; +- if (soute && soute->prio_head == old) +- /* It's still in use, nothing else to do here. */ +- return 0; +- } +- +- /* No hits, we are good to free it. */ +- kfree(old); +- ++ sctp_sched_prio_head_put(old); + return 0; + } + +@@ -206,20 +208,8 @@ static int sctp_sched_prio_init_sid(struct sctp_stream *stream, __u16 sid, + + static void sctp_sched_prio_free_sid(struct sctp_stream *stream, __u16 sid) + { +- struct sctp_stream_priorities *prio = SCTP_SO(stream, sid)->ext->prio_head; +- int i; +- +- if (!prio) +- return; +- ++ sctp_sched_prio_head_put(SCTP_SO(stream, sid)->ext->prio_head); + SCTP_SO(stream, sid)->ext->prio_head = NULL; +- for (i = 0; i < stream->outcnt; i++) { +- if (SCTP_SO(stream, i)->ext && +- SCTP_SO(stream, i)->ext->prio_head == prio) +- return; +- } +- +- kfree(prio); + } + + static void sctp_sched_prio_free(struct sctp_stream *stream) +-- +2.39.2 + diff --git a/queue-5.4/series b/queue-5.4/series index 120296a2245..51277cd60aa 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -282,3 +282,69 @@ drm-radeon-fix-edp-for-single-display-imac11-2.patch wifi-ath9k-use-proper-statements-in-conditionals.patch kbuild-port-silent-mode-detection-to-future-gnu-make.patch net-sched-retire-tcindex-classifier.patch +fs-jfs-fix-shift-exponent-db_agl2size-negative.patch +pwm-sifive-reduce-time-the-controller-lock-is-held.patch +pwm-sifive-always-let-the-first-pwm_apply_state-succ.patch +pwm-stm32-lp-fix-the-check-on-arr-and-cmp-registers-.patch +f2fs-use-memcpy_-to-from-_page-where-possible.patch +fs-f2fs-initialize-fsdata-in-pagecache_write.patch +um-vector-fix-memory-leak-in-vector_config.patch +ubi-ensure-that-vid-header-offset-vid-header-size-al.patch +ubifs-fix-build-errors-as-symbol-undefined.patch +ubifs-rectify-space-budget-for-ubifs_symlink-if-syml.patch +ubifs-rectify-space-budget-for-ubifs_xrename.patch +ubifs-fix-wrong-dirty-space-budget-for-dirty-inode.patch +ubifs-do_rename-fix-wrong-space-budget-when-target-i.patch +ubifs-reserve-one-leb-for-each-journal-head-while-do.patch +ubi-fix-use-after-free-when-volume-resizing-failed.patch +ubi-fix-unreferenced-object-reported-by-kmemleak-in-.patch +ubifs-fix-memory-leak-in-alloc_wbufs.patch +ubi-fix-possible-null-ptr-deref-in-ubi_free_volume.patch +ubifs-re-statistic-cleaned-znode-count-if-commit-fai.patch +ubifs-dirty_cow_znode-fix-memleak-in-error-handling-.patch +ubifs-ubifs_writepage-mark-page-dirty-after-writing-.patch +ubi-fix-uaf-wear-leveling-entry-in-eraseblk_count_se.patch +ubi-ubi_wl_put_peb-fix-infinite-loop-when-wear-level.patch +x86-um-vdso-add-rcx-and-r11-to-the-syscall-clobber-l.patch +watchdog-at91sam9_wdt-use-devm_request_irq-to-avoid-.patch +watchdog-fix-kmemleak-in-watchdog_cdev_register.patch +watchdog-pcwd_usb-fix-attempting-to-access-uninitial.patch +netfilter-ctnetlink-fix-possible-refcount-leak-in-ct.patch +ipv6-add-lwtunnel-encap-size-of-all-siblings-in-next.patch +sctp-add-a-refcnt-in-sctp_stream_priorities-to-avoid.patch +net-fix-__dev_kfree_skb_any-vs-drop-monitor.patch +9p-xen-fix-version-parsing.patch +9p-xen-fix-connection-sequence.patch +9p-rdma-unmap-receive-dma-buffer-in-rdma_request-pos.patch +net-mlx5-geneve-fix-handling-of-geneve-object-id-as-.patch +nfc-fix-memory-leak-of-se_io-context-in-nfc_genl_se_.patch +net-sched-act_sample-fix-action-bind-logic.patch +arm-dts-spear320-hmi-correct-stmpe-gpio-compatible.patch +tcp-tcp_check_req-can-be-called-from-process-context.patch +vc_screen-modify-vcs_size-handling-in-vcs_read.patch +rtc-sun6i-make-external-32k-oscillator-optional.patch +rtc-sun6i-always-export-the-internal-oscillator.patch +scsi-ipr-work-around-fortify-string-warning.patch +thermal-intel-quark_dts-fix-error-pointer-dereferenc.patch +thermal-intel-bxt_pmic-select-regmap-instead-of-depe.patch +tracing-add-null-checks-for-buffer-in-ring_buffer_fr.patch +firmware-efi-sysfb_efi-add-quirk-for-lenovo-ideapad-.patch +mfd-arizona-use-pm_runtime_resume_and_get-to-prevent.patch +media-uvcvideo-handle-cameras-with-invalid-descripto.patch +media-uvcvideo-handle-errors-from-calls-to-usb_strin.patch +media-uvcvideo-quirk-for-autosuspend-in-logitech-b91.patch +media-uvcvideo-silence-memcpy-run-time-false-positiv.patch +staging-emxx_udc-add-checks-for-dma_alloc_coherent.patch +tty-fix-out-of-bounds-access-in-tty_driver_lookup_tt.patch +tty-serial-fsl_lpuart-disable-the-cts-when-send-brea.patch +mei-bus-fixup-upon-error-print-return-values-of-send.patch +parport_pc-set-up-mode-and-ecr-masks-for-oxford-semi.patch +tools-iio-iio_utils-fix-memory-leak.patch +iio-accel-mma9551_core-prevent-uninitialized-variabl.patch +iio-accel-mma9551_core-prevent-uninitialized-variabl.patch-15017 +usb-host-xhci-mvebu-iterate-over-array-indexes-inste.patch +usb-ene_usb6250-allocate-enough-memory-for-full-obje.patch +usb-uvc-enumerate-valid-values-for-color-matching.patch +kernel-fail_function-fix-memory-leak-with-using-debu.patch +pci-add-acs-quirk-for-wangxun-nics.patch +phy-rockchip-typec-fix-unsigned-comparison-with-less.patch diff --git a/queue-5.4/staging-emxx_udc-add-checks-for-dma_alloc_coherent.patch b/queue-5.4/staging-emxx_udc-add-checks-for-dma_alloc_coherent.patch new file mode 100644 index 00000000000..7c937654986 --- /dev/null +++ b/queue-5.4/staging-emxx_udc-add-checks-for-dma_alloc_coherent.patch @@ -0,0 +1,45 @@ +From d6ecd92f304611538519c9187a55d4bb29532cbc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 19 Jan 2023 08:31:19 +0000 +Subject: staging: emxx_udc: Add checks for dma_alloc_coherent() + +From: Yuan Can + +[ Upstream commit f6510a93cfd8c6c79b4dda0f2967cdc6df42eff4 ] + +As the dma_alloc_coherent may return NULL, the return value needs to be +checked to avoid NULL poineter dereference. + +Signed-off-by: Yuan Can +Reviewed-by: Simon Horman +Link: https://lore.kernel.org/r/20230119083119.16956-1-yuancan@huawei.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/emxx_udc/emxx_udc.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c +index cc4c18c3fb36d..7d18ad68be264 100644 +--- a/drivers/staging/emxx_udc/emxx_udc.c ++++ b/drivers/staging/emxx_udc/emxx_udc.c +@@ -2593,10 +2593,15 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep, + req->unaligned = false; + + if (req->unaligned) { +- if (!ep->virt_buf) ++ if (!ep->virt_buf) { + ep->virt_buf = dma_alloc_coherent(udc->dev, PAGE_SIZE, + &ep->phys_buf, + GFP_ATOMIC | GFP_DMA); ++ if (!ep->virt_buf) { ++ spin_unlock_irqrestore(&udc->lock, flags); ++ return -ENOMEM; ++ } ++ } + if (ep->epnum > 0) { + if (ep->direct == USB_DIR_IN) + memcpy(ep->virt_buf, req->req.buf, +-- +2.39.2 + diff --git a/queue-5.4/tcp-tcp_check_req-can-be-called-from-process-context.patch b/queue-5.4/tcp-tcp_check_req-can-be-called-from-process-context.patch new file mode 100644 index 00000000000..abe7999fdd5 --- /dev/null +++ b/queue-5.4/tcp-tcp_check_req-can-be-called-from-process-context.patch @@ -0,0 +1,68 @@ +From d83d5ad8304651eabb42809896c06534dd8f09b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Feb 2023 08:33:36 +0000 +Subject: tcp: tcp_check_req() can be called from process context + +From: Eric Dumazet + +[ Upstream commit 580f98cc33a260bb8c6a39ae2921b29586b84fdf ] + +This is a follow up of commit 0a375c822497 ("tcp: tcp_rtx_synack() +can be called from process context"). + +Frederick Lawler reported another "__this_cpu_add() in preemptible" +warning caused by the same reason. + +In my former patch I took care of tcp_rtx_synack() +but forgot that tcp_check_req() also contained some SNMP updates. + +Note that some parts of tcp_check_req() always run in BH context, +I added a comment to clarify this. + +Fixes: 8336886f786f ("tcp: TCP Fast Open Server - support TFO listeners") +Link: https://lore.kernel.org/netdev/8cd33923-a21d-397c-e46b-2a068c287b03@cloudflare.com/T/ +Signed-off-by: Eric Dumazet +Reported-by: Frederick Lawler +Tested-by: Frederick Lawler +Link: https://lore.kernel.org/r/20230227083336.4153089-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/tcp_minisocks.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c +index 324f43fadb37a..e5dc08579cf58 100644 +--- a/net/ipv4/tcp_minisocks.c ++++ b/net/ipv4/tcp_minisocks.c +@@ -563,6 +563,9 @@ EXPORT_SYMBOL(tcp_create_openreq_child); + * validation and inside tcp_v4_reqsk_send_ack(). Can we do better? + * + * We don't need to initialize tmp_opt.sack_ok as we don't use the results ++ * ++ * Note: If @fastopen is true, this can be called from process context. ++ * Otherwise, this is from BH context. + */ + + struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, +@@ -715,7 +718,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, + &tcp_rsk(req)->last_oow_ack_time)) + req->rsk_ops->send_ack(sk, skb, req); + if (paws_reject) +- __NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED); ++ NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED); + return NULL; + } + +@@ -734,7 +737,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, + * "fourth, check the SYN bit" + */ + if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) { +- __TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS); ++ TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS); + goto embryonic_reset; + } + +-- +2.39.2 + diff --git a/queue-5.4/thermal-intel-bxt_pmic-select-regmap-instead-of-depe.patch b/queue-5.4/thermal-intel-bxt_pmic-select-regmap-instead-of-depe.patch new file mode 100644 index 00000000000..4a0619387ef --- /dev/null +++ b/queue-5.4/thermal-intel-bxt_pmic-select-regmap-instead-of-depe.patch @@ -0,0 +1,43 @@ +From fdcaac71ffffb4cfb1bf0fecb31d2460a298e123 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 25 Feb 2023 21:39:52 -0800 +Subject: thermal: intel: BXT_PMIC: select REGMAP instead of depending on it + +From: Randy Dunlap + +[ Upstream commit 1467fb960349dfa5e300658f1a409dde2cfb0c51 ] + +REGMAP is a hidden (not user visible) symbol. Users cannot set it +directly thru "make *config", so drivers should select it instead of +depending on it if they need it. + +Consistently using "select" or "depends on" can also help reduce +Kconfig circular dependency issues. + +Therefore, change the use of "depends on REGMAP" to "select REGMAP". + +Fixes: b474303ffd57 ("thermal: add Intel BXT WhiskeyCove PMIC thermal driver") +Signed-off-by: Randy Dunlap +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/thermal/intel/Kconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig +index 8025b21f43fa5..b5427579fae59 100644 +--- a/drivers/thermal/intel/Kconfig ++++ b/drivers/thermal/intel/Kconfig +@@ -60,7 +60,8 @@ endmenu + + config INTEL_BXT_PMIC_THERMAL + tristate "Intel Broxton PMIC thermal driver" +- depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP ++ depends on X86 && INTEL_SOC_PMIC_BXTWC ++ select REGMAP + help + Select this driver for Intel Broxton PMIC with ADC channels monitoring + system temperature measurements and alerts. +-- +2.39.2 + diff --git a/queue-5.4/thermal-intel-quark_dts-fix-error-pointer-dereferenc.patch b/queue-5.4/thermal-intel-quark_dts-fix-error-pointer-dereferenc.patch new file mode 100644 index 00000000000..4176d73e690 --- /dev/null +++ b/queue-5.4/thermal-intel-quark_dts-fix-error-pointer-dereferenc.patch @@ -0,0 +1,52 @@ +From 58aa4580f87a62cbee005ad01c4d91d47323c34f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Feb 2023 13:06:50 +0300 +Subject: thermal: intel: quark_dts: fix error pointer dereference + +From: Dan Carpenter + +[ Upstream commit f1b930e740811d416de4d2074da48b6633a672c8 ] + +If alloc_soc_dts() fails, then we can just return. Trying to free +"soc_dts" will lead to an Oops. + +Fixes: 8c1876939663 ("thermal: intel Quark SoC X1000 DTS thermal driver") +Signed-off-by: Dan Carpenter +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/thermal/intel/intel_quark_dts_thermal.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/drivers/thermal/intel/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c +index 5d33b350da1c6..ad92d8f0add19 100644 +--- a/drivers/thermal/intel/intel_quark_dts_thermal.c ++++ b/drivers/thermal/intel/intel_quark_dts_thermal.c +@@ -440,22 +440,14 @@ MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids); + + static int __init intel_quark_thermal_init(void) + { +- int err = 0; +- + if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available()) + return -ENODEV; + + soc_dts = alloc_soc_dts(); +- if (IS_ERR(soc_dts)) { +- err = PTR_ERR(soc_dts); +- goto err_free; +- } ++ if (IS_ERR(soc_dts)) ++ return PTR_ERR(soc_dts); + + return 0; +- +-err_free: +- free_soc_dts(soc_dts); +- return err; + } + + static void __exit intel_quark_thermal_exit(void) +-- +2.39.2 + diff --git a/queue-5.4/tools-iio-iio_utils-fix-memory-leak.patch b/queue-5.4/tools-iio-iio_utils-fix-memory-leak.patch new file mode 100644 index 00000000000..baef0c7b679 --- /dev/null +++ b/queue-5.4/tools-iio-iio_utils-fix-memory-leak.patch @@ -0,0 +1,154 @@ +From 4bfbf8ab1fcce74c1440dc673d16686a7ebe2a57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jan 2023 10:51:47 +0800 +Subject: tools/iio/iio_utils:fix memory leak + +From: Yulong Zhang + +[ Upstream commit f2edf0c819a4823cd6c288801ce737e8d4fcde06 ] + +1. fopen sysfs without fclose. +2. asprintf filename without free. +3. if asprintf return error,do not need to free the buffer. + +Signed-off-by: Yulong Zhang +Link: https://lore.kernel.org/r/20230117025147.69890-1-yulong.zhang@metoak.net +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + tools/iio/iio_utils.c | 23 ++++++----------------- + 1 file changed, 6 insertions(+), 17 deletions(-) + +diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c +index d66b18c54606a..48360994c2a13 100644 +--- a/tools/iio/iio_utils.c ++++ b/tools/iio/iio_utils.c +@@ -262,6 +262,7 @@ int iioutils_get_param_float(float *output, const char *param_name, + if (fscanf(sysfsfp, "%f", output) != 1) + ret = errno ? -errno : -ENODATA; + ++ fclose(sysfsfp); + break; + } + error_free_filename: +@@ -342,9 +343,9 @@ int build_channel_array(const char *device_dir, + } + + sysfsfp = fopen(filename, "r"); ++ free(filename); + if (!sysfsfp) { + ret = -errno; +- free(filename); + goto error_close_dir; + } + +@@ -354,7 +355,6 @@ int build_channel_array(const char *device_dir, + if (fclose(sysfsfp)) + perror("build_channel_array(): Failed to close file"); + +- free(filename); + goto error_close_dir; + } + if (ret == 1) +@@ -362,11 +362,9 @@ int build_channel_array(const char *device_dir, + + if (fclose(sysfsfp)) { + ret = -errno; +- free(filename); + goto error_close_dir; + } + +- free(filename); + } + + *ci_array = malloc(sizeof(**ci_array) * (*counter)); +@@ -392,9 +390,9 @@ int build_channel_array(const char *device_dir, + } + + sysfsfp = fopen(filename, "r"); ++ free(filename); + if (!sysfsfp) { + ret = -errno; +- free(filename); + count--; + goto error_cleanup_array; + } +@@ -402,20 +400,17 @@ int build_channel_array(const char *device_dir, + errno = 0; + if (fscanf(sysfsfp, "%i", ¤t_enabled) != 1) { + ret = errno ? -errno : -ENODATA; +- free(filename); + count--; + goto error_cleanup_array; + } + + if (fclose(sysfsfp)) { + ret = -errno; +- free(filename); + count--; + goto error_cleanup_array; + } + + if (!current_enabled) { +- free(filename); + count--; + continue; + } +@@ -426,7 +421,6 @@ int build_channel_array(const char *device_dir, + strlen(ent->d_name) - + strlen("_en")); + if (!current->name) { +- free(filename); + ret = -ENOMEM; + count--; + goto error_cleanup_array; +@@ -436,7 +430,6 @@ int build_channel_array(const char *device_dir, + ret = iioutils_break_up_name(current->name, + ¤t->generic_name); + if (ret) { +- free(filename); + free(current->name); + count--; + goto error_cleanup_array; +@@ -447,17 +440,16 @@ int build_channel_array(const char *device_dir, + scan_el_dir, + current->name); + if (ret < 0) { +- free(filename); + ret = -ENOMEM; + goto error_cleanup_array; + } + + sysfsfp = fopen(filename, "r"); ++ free(filename); + if (!sysfsfp) { + ret = -errno; +- fprintf(stderr, "failed to open %s\n", +- filename); +- free(filename); ++ fprintf(stderr, "failed to open %s/%s_index\n", ++ scan_el_dir, current->name); + goto error_cleanup_array; + } + +@@ -467,17 +459,14 @@ int build_channel_array(const char *device_dir, + if (fclose(sysfsfp)) + perror("build_channel_array(): Failed to close file"); + +- free(filename); + goto error_cleanup_array; + } + + if (fclose(sysfsfp)) { + ret = -errno; +- free(filename); + goto error_cleanup_array; + } + +- free(filename); + /* Find the scale */ + ret = iioutils_get_param_float(¤t->scale, + "scale", +-- +2.39.2 + diff --git a/queue-5.4/tracing-add-null-checks-for-buffer-in-ring_buffer_fr.patch b/queue-5.4/tracing-add-null-checks-for-buffer-in-ring_buffer_fr.patch new file mode 100644 index 00000000000..e8a8b3f9ebc --- /dev/null +++ b/queue-5.4/tracing-add-null-checks-for-buffer-in-ring_buffer_fr.patch @@ -0,0 +1,62 @@ +From 38a443b4888630183e8a6f9c813ce8166f1c741a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jan 2023 20:55:01 +0800 +Subject: tracing: Add NULL checks for buffer in ring_buffer_free_read_page() + +From: Jia-Ju Bai + +[ Upstream commit 3e4272b9954094907f16861199728f14002fcaf6 ] + +In a previous commit 7433632c9ff6, buffer, buffer->buffers and +buffer->buffers[cpu] in ring_buffer_wake_waiters() can be NULL, +and thus the related checks are added. + +However, in the same call stack, these variables are also used in +ring_buffer_free_read_page(): + +tracing_buffers_release() + ring_buffer_wake_waiters(iter->array_buffer->buffer) + cpu_buffer = buffer->buffers[cpu] -> Add checks by previous commit + ring_buffer_free_read_page(iter->array_buffer->buffer) + cpu_buffer = buffer->buffers[cpu] -> No check + +Thus, to avod possible null-pointer derefernces, the related checks +should be added. + +These results are reported by a static tool designed by myself. + +Link: https://lkml.kernel.org/r/20230113125501.760324-1-baijiaju1990@gmail.com + +Reported-by: TOTE Robot +Signed-off-by: Jia-Ju Bai +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + kernel/trace/ring_buffer.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c +index 11e8189dd8ae9..58809fffc8171 100644 +--- a/kernel/trace/ring_buffer.c ++++ b/kernel/trace/ring_buffer.c +@@ -4769,11 +4769,16 @@ EXPORT_SYMBOL_GPL(ring_buffer_alloc_read_page); + */ + void ring_buffer_free_read_page(struct ring_buffer *buffer, int cpu, void *data) + { +- struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu]; ++ struct ring_buffer_per_cpu *cpu_buffer; + struct buffer_data_page *bpage = data; + struct page *page = virt_to_page(bpage); + unsigned long flags; + ++ if (!buffer || !buffer->buffers || !buffer->buffers[cpu]) ++ return; ++ ++ cpu_buffer = buffer->buffers[cpu]; ++ + /* If the page is still in use someplace else, we can't reuse it */ + if (page_ref_count(page) > 1) + goto out; +-- +2.39.2 + diff --git a/queue-5.4/tty-fix-out-of-bounds-access-in-tty_driver_lookup_tt.patch b/queue-5.4/tty-fix-out-of-bounds-access-in-tty_driver_lookup_tt.patch new file mode 100644 index 00000000000..782f8ebb0ad --- /dev/null +++ b/queue-5.4/tty-fix-out-of-bounds-access-in-tty_driver_lookup_tt.patch @@ -0,0 +1,75 @@ +From f17401194dfef81639d54ab83483700b4aa9715e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 9 Dec 2022 12:27:36 +0100 +Subject: tty: fix out-of-bounds access in tty_driver_lookup_tty() + +From: Sven Schnelle + +[ Upstream commit db4df8e9d79e7d37732c1a1b560958e8dadfefa1 ] + +When specifying an invalid console= device like console=tty3270, +tty_driver_lookup_tty() returns the tty struct without checking +whether index is a valid number. + +To reproduce: + +qemu-system-x86_64 -enable-kvm -nographic -serial mon:stdio \ +-kernel ../linux-build-x86/arch/x86/boot/bzImage \ +-append "console=ttyS0 console=tty3270" + +This crashes with: + +[ 0.770599] BUG: kernel NULL pointer dereference, address: 00000000000000ef +[ 0.771265] #PF: supervisor read access in kernel mode +[ 0.771773] #PF: error_code(0x0000) - not-present page +[ 0.772609] Oops: 0000 [#1] PREEMPT SMP PTI +[ 0.774878] RIP: 0010:tty_open+0x268/0x6f0 +[ 0.784013] chrdev_open+0xbd/0x230 +[ 0.784444] ? cdev_device_add+0x80/0x80 +[ 0.784920] do_dentry_open+0x1e0/0x410 +[ 0.785389] path_openat+0xca9/0x1050 +[ 0.785813] do_filp_open+0xaa/0x150 +[ 0.786240] file_open_name+0x133/0x1b0 +[ 0.786746] filp_open+0x27/0x50 +[ 0.787244] console_on_rootfs+0x14/0x4d +[ 0.787800] kernel_init_freeable+0x1e4/0x20d +[ 0.788383] ? rest_init+0xc0/0xc0 +[ 0.788881] kernel_init+0x11/0x120 +[ 0.789356] ret_from_fork+0x22/0x30 + +Signed-off-by: Sven Schnelle +Reviewed-by: Jiri Slaby +Link: https://lore.kernel.org/r/20221209112737.3222509-2-svens@linux.ibm.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/tty_io.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c +index ddfe873b5fccb..37c46c65a65f4 100644 +--- a/drivers/tty/tty_io.c ++++ b/drivers/tty/tty_io.c +@@ -1156,14 +1156,16 @@ static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver, + { + struct tty_struct *tty; + +- if (driver->ops->lookup) ++ if (driver->ops->lookup) { + if (!file) + tty = ERR_PTR(-EIO); + else + tty = driver->ops->lookup(driver, file, idx); +- else ++ } else { ++ if (idx >= driver->num) ++ return ERR_PTR(-EINVAL); + tty = driver->ttys[idx]; +- ++ } + if (!IS_ERR(tty)) + tty_kref_get(tty); + return tty; +-- +2.39.2 + diff --git a/queue-5.4/tty-serial-fsl_lpuart-disable-the-cts-when-send-brea.patch b/queue-5.4/tty-serial-fsl_lpuart-disable-the-cts-when-send-brea.patch new file mode 100644 index 00000000000..f5d83e765cd --- /dev/null +++ b/queue-5.4/tty-serial-fsl_lpuart-disable-the-cts-when-send-brea.patch @@ -0,0 +1,76 @@ +From 884d564d250dc0a3bd4264c7df6958037f4220dc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 14 Dec 2022 11:11:35 +0800 +Subject: tty: serial: fsl_lpuart: disable the CTS when send break signal + +From: Sherry Sun + +[ Upstream commit c4c81db5cf8bc53d6160c3abf26d382c841aa434 ] + +LPUART IP has a bug that it treats the CTS as higher priority than the +break signal, which cause the break signal sending through UARTCTRL_SBK +may impacted by the CTS input if the HW flow control is enabled. + +Add this workaround patch to fix the IP bug, we can disable CTS before +asserting SBK to avoid any interference from CTS, and re-enable it when +break off. + +Such as for the bluetooth chip power save feature, host can let the BT +chip get into sleep state by sending a UART break signal, and wake it up +by turning off the UART break. If the BT chip enters the sleep mode +successfully, it will pull up the CTS line, if the BT chip is woken up, +it will pull down the CTS line. If without this workaround patch, the +UART TX pin cannot send the break signal successfully as it affected by +the BT CTS pin. After adding this patch, the BT power save feature can +work well. + +Signed-off-by: Sherry Sun +Link: https://lore.kernel.org/r/20221214031137.28815-2-sherry.sun@nxp.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/fsl_lpuart.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c +index e84cef42f4b78..790e482625796 100644 +--- a/drivers/tty/serial/fsl_lpuart.c ++++ b/drivers/tty/serial/fsl_lpuart.c +@@ -1370,12 +1370,32 @@ static void lpuart_break_ctl(struct uart_port *port, int break_state) + + static void lpuart32_break_ctl(struct uart_port *port, int break_state) + { +- unsigned long temp; ++ unsigned long temp, modem; ++ struct tty_struct *tty; ++ unsigned int cflag = 0; ++ ++ tty = tty_port_tty_get(&port->state->port); ++ if (tty) { ++ cflag = tty->termios.c_cflag; ++ tty_kref_put(tty); ++ } + + temp = lpuart32_read(port, UARTCTRL) & ~UARTCTRL_SBK; ++ modem = lpuart32_read(port, UARTMODIR); + +- if (break_state != 0) ++ if (break_state != 0) { + temp |= UARTCTRL_SBK; ++ /* ++ * LPUART CTS has higher priority than SBK, need to disable CTS before ++ * asserting SBK to avoid any interference if flow control is enabled. ++ */ ++ if (cflag & CRTSCTS && modem & UARTMODIR_TXCTSE) ++ lpuart32_write(port, modem & ~UARTMODIR_TXCTSE, UARTMODIR); ++ } else { ++ /* Re-enable the CTS when break off. */ ++ if (cflag & CRTSCTS && !(modem & UARTMODIR_TXCTSE)) ++ lpuart32_write(port, modem | UARTMODIR_TXCTSE, UARTMODIR); ++ } + + lpuart32_write(port, temp, UARTCTRL); + } +-- +2.39.2 + diff --git a/queue-5.4/ubi-ensure-that-vid-header-offset-vid-header-size-al.patch b/queue-5.4/ubi-ensure-that-vid-header-offset-vid-header-size-al.patch new file mode 100644 index 00000000000..0cf2a9918ec --- /dev/null +++ b/queue-5.4/ubi-ensure-that-vid-header-offset-vid-header-size-al.patch @@ -0,0 +1,131 @@ +From d3a4f79aae0f3c1cc63a725b5de0da90b51d5afd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Nov 2022 10:14:44 -0500 +Subject: ubi: ensure that VID header offset + VID header size <= alloc, size + +From: George Kennedy + +[ Upstream commit 1b42b1a36fc946f0d7088425b90d491b4257ca3e ] + +Ensure that the VID header offset + VID header size does not exceed +the allocated area to avoid slab OOB. + +BUG: KASAN: slab-out-of-bounds in crc32_body lib/crc32.c:111 [inline] +BUG: KASAN: slab-out-of-bounds in crc32_le_generic lib/crc32.c:179 [inline] +BUG: KASAN: slab-out-of-bounds in crc32_le_base+0x58c/0x626 lib/crc32.c:197 +Read of size 4 at addr ffff88802bb36f00 by task syz-executor136/1555 + +CPU: 2 PID: 1555 Comm: syz-executor136 Tainted: G W +6.0.0-1868 #1 +Hardware name: Red Hat KVM, BIOS 1.13.0-2.module+el8.3.0+7860+a7792d29 +04/01/2014 +Call Trace: + + __dump_stack lib/dump_stack.c:88 [inline] + dump_stack_lvl+0x85/0xad lib/dump_stack.c:106 + print_address_description mm/kasan/report.c:317 [inline] + print_report.cold.13+0xb6/0x6bb mm/kasan/report.c:433 + kasan_report+0xa7/0x11b mm/kasan/report.c:495 + crc32_body lib/crc32.c:111 [inline] + crc32_le_generic lib/crc32.c:179 [inline] + crc32_le_base+0x58c/0x626 lib/crc32.c:197 + ubi_io_write_vid_hdr+0x1b7/0x472 drivers/mtd/ubi/io.c:1067 + create_vtbl+0x4d5/0x9c4 drivers/mtd/ubi/vtbl.c:317 + create_empty_lvol drivers/mtd/ubi/vtbl.c:500 [inline] + ubi_read_volume_table+0x67b/0x288a drivers/mtd/ubi/vtbl.c:812 + ubi_attach+0xf34/0x1603 drivers/mtd/ubi/attach.c:1601 + ubi_attach_mtd_dev+0x6f3/0x185e drivers/mtd/ubi/build.c:965 + ctrl_cdev_ioctl+0x2db/0x347 drivers/mtd/ubi/cdev.c:1043 + vfs_ioctl fs/ioctl.c:51 [inline] + __do_sys_ioctl fs/ioctl.c:870 [inline] + __se_sys_ioctl fs/ioctl.c:856 [inline] + __x64_sys_ioctl+0x193/0x213 fs/ioctl.c:856 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x3e/0x86 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0x0 +RIP: 0033:0x7f96d5cf753d +Code: +RSP: 002b:00007fffd72206f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 +RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f96d5cf753d +RDX: 0000000020000080 RSI: 0000000040186f40 RDI: 0000000000000003 +RBP: 0000000000400cd0 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000400be0 +R13: 00007fffd72207e0 R14: 0000000000000000 R15: 0000000000000000 + + +Allocated by task 1555: + kasan_save_stack+0x20/0x3d mm/kasan/common.c:38 + kasan_set_track mm/kasan/common.c:45 [inline] + set_alloc_info mm/kasan/common.c:437 [inline] + ____kasan_kmalloc mm/kasan/common.c:516 [inline] + __kasan_kmalloc+0x88/0xa3 mm/kasan/common.c:525 + kasan_kmalloc include/linux/kasan.h:234 [inline] + __kmalloc+0x138/0x257 mm/slub.c:4429 + kmalloc include/linux/slab.h:605 [inline] + ubi_alloc_vid_buf drivers/mtd/ubi/ubi.h:1093 [inline] + create_vtbl+0xcc/0x9c4 drivers/mtd/ubi/vtbl.c:295 + create_empty_lvol drivers/mtd/ubi/vtbl.c:500 [inline] + ubi_read_volume_table+0x67b/0x288a drivers/mtd/ubi/vtbl.c:812 + ubi_attach+0xf34/0x1603 drivers/mtd/ubi/attach.c:1601 + ubi_attach_mtd_dev+0x6f3/0x185e drivers/mtd/ubi/build.c:965 + ctrl_cdev_ioctl+0x2db/0x347 drivers/mtd/ubi/cdev.c:1043 + vfs_ioctl fs/ioctl.c:51 [inline] + __do_sys_ioctl fs/ioctl.c:870 [inline] + __se_sys_ioctl fs/ioctl.c:856 [inline] + __x64_sys_ioctl+0x193/0x213 fs/ioctl.c:856 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x3e/0x86 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x63/0x0 + +The buggy address belongs to the object at ffff88802bb36e00 + which belongs to the cache kmalloc-256 of size 256 +The buggy address is located 0 bytes to the right of + 256-byte region [ffff88802bb36e00, ffff88802bb36f00) + +The buggy address belongs to the physical page: +page:00000000ea4d1263 refcount:1 mapcount:0 mapping:0000000000000000 +index:0x0 pfn:0x2bb36 +head:00000000ea4d1263 order:1 compound_mapcount:0 compound_pincount:0 +flags: 0xfffffc0010200(slab|head|node=0|zone=1|lastcpupid=0x1fffff) +raw: 000fffffc0010200 ffffea000066c300 dead000000000003 ffff888100042b40 +raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000 +page dumped because: kasan: bad access detected + +Memory state around the buggy address: + ffff88802bb36e00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + ffff88802bb36e80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +>ffff88802bb36f00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ^ + ffff88802bb36f80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ffff88802bb37000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb +================================================================== + +Fixes: 801c135ce73d ("UBI: Unsorted Block Images") +Reported-by: syzkaller +Signed-off-by: George Kennedy +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + drivers/mtd/ubi/build.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c +index df521ff0b3280..6fd6c3e01f72f 100644 +--- a/drivers/mtd/ubi/build.c ++++ b/drivers/mtd/ubi/build.c +@@ -643,6 +643,12 @@ static int io_init(struct ubi_device *ubi, int max_beb_per1024) + ubi->ec_hdr_alsize = ALIGN(UBI_EC_HDR_SIZE, ubi->hdrs_min_io_size); + ubi->vid_hdr_alsize = ALIGN(UBI_VID_HDR_SIZE, ubi->hdrs_min_io_size); + ++ if (ubi->vid_hdr_offset && ((ubi->vid_hdr_offset + UBI_VID_HDR_SIZE) > ++ ubi->vid_hdr_alsize)) { ++ ubi_err(ubi, "VID header offset %d too large.", ubi->vid_hdr_offset); ++ return -EINVAL; ++ } ++ + dbg_gen("min_io_size %d", ubi->min_io_size); + dbg_gen("max_write_size %d", ubi->max_write_size); + dbg_gen("hdrs_min_io_size %d", ubi->hdrs_min_io_size); +-- +2.39.2 + diff --git a/queue-5.4/ubi-fix-possible-null-ptr-deref-in-ubi_free_volume.patch b/queue-5.4/ubi-fix-possible-null-ptr-deref-in-ubi_free_volume.patch new file mode 100644 index 00000000000..0b35da6ccb3 --- /dev/null +++ b/queue-5.4/ubi-fix-possible-null-ptr-deref-in-ubi_free_volume.patch @@ -0,0 +1,89 @@ +From 31242ce35ff3f97340c40663a82371d510919782 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Nov 2022 18:26:24 +0800 +Subject: ubi: Fix possible null-ptr-deref in ubi_free_volume() + +From: Yang Yingliang + +[ Upstream commit c15859bfd326c10230f09cb48a17f8a35f190342 ] + +It willl cause null-ptr-deref in the following case: + +uif_init() + ubi_add_volume() + cdev_add() -> if it fails, call kill_volumes() + device_register() + +kill_volumes() -> if ubi_add_volume() fails call this function + ubi_free_volume() + cdev_del() + device_unregister() -> trying to delete a not added device, + it causes null-ptr-deref + +So in ubi_free_volume(), it delete devices whether they are added +or not, it will causes null-ptr-deref. + +Handle the error case whlie calling ubi_add_volume() to fix this +problem. If add volume fails, set the corresponding vol to null, +so it can not be accessed in kill_volumes() and release the +resource in ubi_add_volume() error path. + +Fixes: 801c135ce73d ("UBI: Unsorted Block Images") +Suggested-by: Zhihao Cheng +Signed-off-by: Yang Yingliang +Reviewed-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + drivers/mtd/ubi/build.c | 1 + + drivers/mtd/ubi/vmt.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c +index 6fd6c3e01f72f..13f8292ceea52 100644 +--- a/drivers/mtd/ubi/build.c ++++ b/drivers/mtd/ubi/build.c +@@ -467,6 +467,7 @@ static int uif_init(struct ubi_device *ubi) + err = ubi_add_volume(ubi, ubi->volumes[i]); + if (err) { + ubi_err(ubi, "cannot add volume %d", i); ++ ubi->volumes[i] = NULL; + goto out_volumes; + } + } +diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c +index 2e5bd473e5e25..d79323e8ea29d 100644 +--- a/drivers/mtd/ubi/vmt.c ++++ b/drivers/mtd/ubi/vmt.c +@@ -582,6 +582,7 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) + if (err) { + ubi_err(ubi, "cannot add character device for volume %d, error %d", + vol_id, err); ++ vol_release(&vol->dev); + return err; + } + +@@ -592,15 +593,14 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) + vol->dev.groups = volume_dev_groups; + dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id); + err = device_register(&vol->dev); +- if (err) +- goto out_cdev; ++ if (err) { ++ cdev_del(&vol->cdev); ++ put_device(&vol->dev); ++ return err; ++ } + + self_check_volumes(ubi); + return err; +- +-out_cdev: +- cdev_del(&vol->cdev); +- return err; + } + + /** +-- +2.39.2 + diff --git a/queue-5.4/ubi-fix-uaf-wear-leveling-entry-in-eraseblk_count_se.patch b/queue-5.4/ubi-fix-uaf-wear-leveling-entry-in-eraseblk_count_se.patch new file mode 100644 index 00000000000..54ac6af6bcd --- /dev/null +++ b/queue-5.4/ubi-fix-uaf-wear-leveling-entry-in-eraseblk_count_se.patch @@ -0,0 +1,76 @@ +From 202da11b7128e4e37e19503adfc037cdafab1181 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Jul 2022 19:28:37 +0800 +Subject: ubi: Fix UAF wear-leveling entry in eraseblk_count_seq_show() + +From: Zhihao Cheng + +[ Upstream commit a240bc5c43130c6aa50831d7caaa02a1d84e1bce ] + +Wear-leveling entry could be freed in error path, which may be accessed +again in eraseblk_count_seq_show(), for example: + +__erase_worker eraseblk_count_seq_show + wl = ubi->lookuptbl[*block_number] + if (wl) + wl_entry_destroy + ubi->lookuptbl[e->pnum] = NULL + kmem_cache_free(ubi_wl_entry_slab, e) + erase_count = wl->ec // UAF! + +Wear-leveling entry updating/accessing in ubi->lookuptbl should be +protected by ubi->wl_lock, fix it by adding ubi->wl_lock to serialize +wl entry accessing between wl_entry_destroy() and +eraseblk_count_seq_show(). + +Fetch a reproducer in [Link]. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216305 +Fixes: 7bccd12d27b7e3 ("ubi: Add debugfs file for tracking PEB state") +Fixes: 801c135ce73d5d ("UBI: Unsorted Block Images") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + drivers/mtd/ubi/wl.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c +index 7def041bbe484..585c5273b1fb5 100644 +--- a/drivers/mtd/ubi/wl.c ++++ b/drivers/mtd/ubi/wl.c +@@ -879,8 +879,11 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, + + err = do_sync_erase(ubi, e1, vol_id, lnum, 0); + if (err) { +- if (e2) ++ if (e2) { ++ spin_lock(&ubi->wl_lock); + wl_entry_destroy(ubi, e2); ++ spin_unlock(&ubi->wl_lock); ++ } + goto out_ro; + } + +@@ -1110,14 +1113,18 @@ static int __erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk) + /* Re-schedule the LEB for erasure */ + err1 = schedule_erase(ubi, e, vol_id, lnum, 0, false); + if (err1) { ++ spin_lock(&ubi->wl_lock); + wl_entry_destroy(ubi, e); ++ spin_unlock(&ubi->wl_lock); + err = err1; + goto out_ro; + } + return err; + } + ++ spin_lock(&ubi->wl_lock); + wl_entry_destroy(ubi, e); ++ spin_unlock(&ubi->wl_lock); + if (err != -EIO) + /* + * If this is not %-EIO, we have no idea what to do. Scheduling +-- +2.39.2 + diff --git a/queue-5.4/ubi-fix-unreferenced-object-reported-by-kmemleak-in-.patch b/queue-5.4/ubi-fix-unreferenced-object-reported-by-kmemleak-in-.patch new file mode 100644 index 00000000000..8694be32b01 --- /dev/null +++ b/queue-5.4/ubi-fix-unreferenced-object-reported-by-kmemleak-in-.patch @@ -0,0 +1,59 @@ +From 22bbc07ee034402d753905740f62c02924ad64c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Oct 2022 18:21:57 +0800 +Subject: ubi: Fix unreferenced object reported by kmemleak in + ubi_resize_volume() + +From: Li Zetao + +[ Upstream commit 1e591ea072df7211f64542a09482b5f81cb3ad27 ] + +There is a memory leaks problem reported by kmemleak: + +unreferenced object 0xffff888102007a00 (size 128): + comm "ubirsvol", pid 32090, jiffies 4298464136 (age 2361.231s) + hex dump (first 32 bytes): +ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ +ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ + backtrace: +[] __kmalloc+0x4d/0x150 +[] ubi_eba_create_table+0x76/0x170 [ubi] +[] ubi_resize_volume+0x1be/0xbc0 [ubi] +[] ubi_cdev_ioctl+0x701/0x1850 [ubi] +[] __x64_sys_ioctl+0x11d/0x170 +[] do_syscall_64+0x35/0x80 +[] entry_SYSCALL_64_after_hwframe+0x46/0xb0 + +This is due to a mismatch between create and destroy interfaces, and +in detail that "new_eba_tbl" created by ubi_eba_create_table() but +destroyed by kfree(), while will causing "new_eba_tbl->entries" not +freed. + +Fix it by replacing kfree(new_eba_tbl) with +ubi_eba_destroy_table(new_eba_tbl) + +Fixes: 799dca34ac54 ("UBI: hide EBA internals") +Signed-off-by: Li Zetao +Reviewed-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + drivers/mtd/ubi/vmt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c +index 6c7822c1cc451..2e5bd473e5e25 100644 +--- a/drivers/mtd/ubi/vmt.c ++++ b/drivers/mtd/ubi/vmt.c +@@ -515,7 +515,7 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) + return err; + + out_free: +- kfree(new_eba_tbl); ++ ubi_eba_destroy_table(new_eba_tbl); + return err; + } + +-- +2.39.2 + diff --git a/queue-5.4/ubi-fix-use-after-free-when-volume-resizing-failed.patch b/queue-5.4/ubi-fix-use-after-free-when-volume-resizing-failed.patch new file mode 100644 index 00000000000..aacd478fd84 --- /dev/null +++ b/queue-5.4/ubi-fix-use-after-free-when-volume-resizing-failed.patch @@ -0,0 +1,74 @@ +From 9a6359e9aef3a3fa0200f7c413ebd4c18ce6dcfc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Oct 2022 18:21:56 +0800 +Subject: ubi: Fix use-after-free when volume resizing failed + +From: Li Zetao + +[ Upstream commit 9af31d6ec1a4be4caab2550096c6bd2ba8fba472 ] + +There is an use-after-free problem reported by KASAN: + ================================================================== + BUG: KASAN: use-after-free in ubi_eba_copy_table+0x11f/0x1c0 [ubi] + Read of size 8 at addr ffff888101eec008 by task ubirsvol/4735 + + CPU: 2 PID: 4735 Comm: ubirsvol + Not tainted 6.1.0-rc1-00003-g84fa3304a7fc-dirty #14 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), + BIOS 1.14.0-1.fc33 04/01/2014 + Call Trace: + + dump_stack_lvl+0x34/0x44 + print_report+0x171/0x472 + kasan_report+0xad/0x130 + ubi_eba_copy_table+0x11f/0x1c0 [ubi] + ubi_resize_volume+0x4f9/0xbc0 [ubi] + ubi_cdev_ioctl+0x701/0x1850 [ubi] + __x64_sys_ioctl+0x11d/0x170 + do_syscall_64+0x35/0x80 + entry_SYSCALL_64_after_hwframe+0x46/0xb0 + + +When ubi_change_vtbl_record() returns an error in ubi_resize_volume(), +"new_eba_tbl" will be freed on error handing path, but it is holded +by "vol->eba_tbl" in ubi_eba_replace_table(). It means that the liftcycle +of "vol->eba_tbl" and "vol" are different, so when resizing volume in +next time, it causing an use-after-free fault. + +Fix it by not freeing "new_eba_tbl" after it replaced in +ubi_eba_replace_table(), while will be freed in next volume resizing. + +Fixes: 801c135ce73d ("UBI: Unsorted Block Images") +Signed-off-by: Li Zetao +Reviewed-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + drivers/mtd/ubi/vmt.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c +index 6ea95ade4ca6b..6c7822c1cc451 100644 +--- a/drivers/mtd/ubi/vmt.c ++++ b/drivers/mtd/ubi/vmt.c +@@ -464,7 +464,7 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) + for (i = 0; i < -pebs; i++) { + err = ubi_eba_unmap_leb(ubi, vol, reserved_pebs + i); + if (err) +- goto out_acc; ++ goto out_free; + } + spin_lock(&ubi->volumes_lock); + ubi->rsvd_pebs += pebs; +@@ -512,6 +512,8 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) + ubi->avail_pebs += pebs; + spin_unlock(&ubi->volumes_lock); + } ++ return err; ++ + out_free: + kfree(new_eba_tbl); + return err; +-- +2.39.2 + diff --git a/queue-5.4/ubi-ubi_wl_put_peb-fix-infinite-loop-when-wear-level.patch b/queue-5.4/ubi-ubi_wl_put_peb-fix-infinite-loop-when-wear-level.patch new file mode 100644 index 00000000000..fd782944f9c --- /dev/null +++ b/queue-5.4/ubi-ubi_wl_put_peb-fix-infinite-loop-when-wear-level.patch @@ -0,0 +1,90 @@ +From 95e5a7c0b65277b533fad62b726b7995bb259aed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Jun 2022 14:59:04 +0800 +Subject: ubi: ubi_wl_put_peb: Fix infinite loop when wear-leveling work failed + +From: Zhihao Cheng + +[ Upstream commit 4d57a7333e26040f2b583983e1970d9d460e56b0 ] + +Following process will trigger an infinite loop in ubi_wl_put_peb(): + + ubifs_bgt ubi_bgt +ubifs_leb_unmap + ubi_leb_unmap + ubi_eba_unmap_leb + ubi_wl_put_peb wear_leveling_worker + e1 = rb_entry(rb_first(&ubi->used) + e2 = get_peb_for_wl(ubi) + ubi_io_read_vid_hdr // return err (flash fault) + out_error: + ubi->move_from = ubi->move_to = NULL + wl_entry_destroy(ubi, e1) + ubi->lookuptbl[e->pnum] = NULL + retry: + e = ubi->lookuptbl[pnum]; // return NULL + if (e == ubi->move_from) { // NULL == NULL gets true + goto retry; // infinite loop !!! + +$ top + PID USER PR NI VIRT RES SHR S %CPU %MEM COMMAND + 7676 root 20 0 0 0 0 R 100.0 0.0 ubifs_bgt0_0 + +Fix it by: + 1) Letting ubi_wl_put_peb() returns directly if wearl leveling entry has + been removed from 'ubi->lookuptbl'. + 2) Using 'ubi->wl_lock' protecting wl entry deletion to preventing an + use-after-free problem for wl entry in ubi_wl_put_peb(). + +Fetch a reproducer in [Link]. + +Fixes: 43f9b25a9cdd7b1 ("UBI: bugfix: protect from volume removal") +Fixes: ee59ba8b064f692 ("UBI: Fix stale pointers in ubi->lookuptbl") +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216111 +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + drivers/mtd/ubi/wl.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c +index 585c5273b1fb5..4f88433d4adc7 100644 +--- a/drivers/mtd/ubi/wl.c ++++ b/drivers/mtd/ubi/wl.c +@@ -965,11 +965,11 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, + spin_lock(&ubi->wl_lock); + ubi->move_from = ubi->move_to = NULL; + ubi->move_to_put = ubi->wl_scheduled = 0; ++ wl_entry_destroy(ubi, e1); ++ wl_entry_destroy(ubi, e2); + spin_unlock(&ubi->wl_lock); + + ubi_free_vid_buf(vidb); +- wl_entry_destroy(ubi, e1); +- wl_entry_destroy(ubi, e2); + + out_ro: + ubi_ro_mode(ubi); +@@ -1240,6 +1240,18 @@ int ubi_wl_put_peb(struct ubi_device *ubi, int vol_id, int lnum, + retry: + spin_lock(&ubi->wl_lock); + e = ubi->lookuptbl[pnum]; ++ if (!e) { ++ /* ++ * This wl entry has been removed for some errors by other ++ * process (eg. wear leveling worker), corresponding process ++ * (except __erase_worker, which cannot concurrent with ++ * ubi_wl_put_peb) will set ubi ro_mode at the same time, ++ * just ignore this wl entry. ++ */ ++ spin_unlock(&ubi->wl_lock); ++ up_read(&ubi->fm_protect); ++ return 0; ++ } + if (e == ubi->move_from) { + /* + * User is putting the physical eraseblock which was selected to +-- +2.39.2 + diff --git a/queue-5.4/ubifs-dirty_cow_znode-fix-memleak-in-error-handling-.patch b/queue-5.4/ubifs-dirty_cow_znode-fix-memleak-in-error-handling-.patch new file mode 100644 index 00000000000..02bb431e42c --- /dev/null +++ b/queue-5.4/ubifs-dirty_cow_znode-fix-memleak-in-error-handling-.patch @@ -0,0 +1,58 @@ +From ab90b9c50653010bb145a7f5e075fe4b3f150edb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Nov 2022 17:02:36 +0800 +Subject: ubifs: dirty_cow_znode: Fix memleak in error handling path + +From: Zhihao Cheng + +[ Upstream commit 122deabfe1428bffe95e2bf364ff8a5059bdf089 ] + +Following process will cause a memleak for copied up znode: + +dirty_cow_znode + zn = copy_znode(c, znode); + err = insert_old_idx(c, zbr->lnum, zbr->offs); + if (unlikely(err)) + return ERR_PTR(err); // No one refers to zn. + +Fix it by adding copied znode back to tnc, then it will be freed +by ubifs_destroy_tnc_subtree() while closing tnc. + +Fetch a reproducer in [Link]. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216705 +Fixes: 1e51764a3c2a ("UBIFS: add new flash file system") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/tnc.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c +index b162561ca9c31..6461f61449b1a 100644 +--- a/fs/ubifs/tnc.c ++++ b/fs/ubifs/tnc.c +@@ -267,11 +267,18 @@ static struct ubifs_znode *dirty_cow_znode(struct ubifs_info *c, + if (zbr->len) { + err = insert_old_idx(c, zbr->lnum, zbr->offs); + if (unlikely(err)) +- return ERR_PTR(err); ++ /* ++ * Obsolete znodes will be freed by tnc_destroy_cnext() ++ * or free_obsolete_znodes(), copied up znodes should ++ * be added back to tnc and freed by ++ * ubifs_destroy_tnc_subtree(). ++ */ ++ goto out; + err = add_idx_dirt(c, zbr->lnum, zbr->len); + } else + err = 0; + ++out: + zbr->znode = zn; + zbr->lnum = 0; + zbr->offs = 0; +-- +2.39.2 + diff --git a/queue-5.4/ubifs-do_rename-fix-wrong-space-budget-when-target-i.patch b/queue-5.4/ubifs-do_rename-fix-wrong-space-budget-when-target-i.patch new file mode 100644 index 00000000000..0e723131042 --- /dev/null +++ b/queue-5.4/ubifs-do_rename-fix-wrong-space-budget-when-target-i.patch @@ -0,0 +1,43 @@ +From 433f7654929e38a1b48efa6584ce5956150d6792 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Oct 2022 11:47:31 +0800 +Subject: ubifs: do_rename: Fix wrong space budget when target inode's nlink > + 1 + +From: Zhihao Cheng + +[ Upstream commit 25fce616a61fc2f1821e4a9ce212d0e064707093 ] + +If target inode is a special file (eg. block/char device) with nlink +count greater than 1, the inode with ui->data will be re-written on +disk. However, UBIFS losts target inode's data_len while doing space +budget. Bad space budget may let make_reservation() return with -ENOSPC, +which could turn ubifs to read-only mode in do_writepage() process. + +Fetch a reproducer in [Link]. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216494 +Fixes: 1e51764a3c2ac0 ("UBIFS: add new flash file system") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c +index 9a4f9563aceea..332c0b02a0ade 100644 +--- a/fs/ubifs/dir.c ++++ b/fs/ubifs/dir.c +@@ -1296,6 +1296,8 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, + if (unlink) { + ubifs_assert(c, inode_is_locked(new_inode)); + ++ /* Budget for old inode's data when its nlink > 1. */ ++ req.dirtied_ino_d = ALIGN(ubifs_inode(new_inode)->data_len, 8); + err = ubifs_purge_xattrs(new_inode); + if (err) + return err; +-- +2.39.2 + diff --git a/queue-5.4/ubifs-fix-build-errors-as-symbol-undefined.patch b/queue-5.4/ubifs-fix-build-errors-as-symbol-undefined.patch new file mode 100644 index 00000000000..9b7f9abaea1 --- /dev/null +++ b/queue-5.4/ubifs-fix-build-errors-as-symbol-undefined.patch @@ -0,0 +1,49 @@ +From b374058a91ebb6737267d7329779177f6f51e563 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Nov 2022 19:18:47 +0800 +Subject: ubifs: Fix build errors as symbol undefined + +From: Li Hua + +[ Upstream commit aa6d148e6d6270274e3d5a529b71c54cd329d17f ] + +With CONFIG_UBIFS_FS_AUTHENTICATION not set, the compiler can assume that +ubifs_node_check_hash() is never true and drops the call to ubifs_bad_hash(). +Is CONFIG_CC_OPTIMIZE_FOR_SIZE enabled this optimization does not happen anymore. + +So When CONFIG_UBIFS_FS and CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled but +CONFIG_UBIFS_FS_AUTHENTICATION is not set, the build errors is as followd: + ERROR: modpost: "ubifs_bad_hash" [fs/ubifs/ubifs.ko] undefined! + +Fix it by add no-op ubifs_bad_hash() for the CONFIG_UBIFS_FS_AUTHENTICATION=n case. + +Fixes: 16a26b20d2af ("ubifs: authentication: Add hashes to index nodes") +Signed-off-by: Li Hua +Reviewed-by: Sascha Hauer +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/ubifs.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h +index b3b7e3576e980..85e84138649b5 100644 +--- a/fs/ubifs/ubifs.h ++++ b/fs/ubifs/ubifs.h +@@ -1593,8 +1593,13 @@ static inline int ubifs_check_hmac(const struct ubifs_info *c, + return crypto_memneq(expected, got, c->hmac_desc_len); + } + ++#ifdef CONFIG_UBIFS_FS_AUTHENTICATION + void ubifs_bad_hash(const struct ubifs_info *c, const void *node, + const u8 *hash, int lnum, int offs); ++#else ++static inline void ubifs_bad_hash(const struct ubifs_info *c, const void *node, ++ const u8 *hash, int lnum, int offs) {}; ++#endif + + int __ubifs_node_check_hash(const struct ubifs_info *c, const void *buf, + const u8 *expected); +-- +2.39.2 + diff --git a/queue-5.4/ubifs-fix-memory-leak-in-alloc_wbufs.patch b/queue-5.4/ubifs-fix-memory-leak-in-alloc_wbufs.patch new file mode 100644 index 00000000000..36207ec5743 --- /dev/null +++ b/queue-5.4/ubifs-fix-memory-leak-in-alloc_wbufs.patch @@ -0,0 +1,104 @@ +From f3e5759effd605350c6ab4f0887fb4ddf780cb31 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 22 Oct 2022 19:52:11 +0800 +Subject: ubifs: Fix memory leak in alloc_wbufs() + +From: Li Zetao + +[ Upstream commit 4a1ff3c5d04b9079b4f768d9a71b51c4af578dd2 ] + +kmemleak reported a sequence of memory leaks, and show them as following: + + unreferenced object 0xffff8881575f8400 (size 1024): + comm "mount", pid 19625, jiffies 4297119604 (age 20.383s) + hex dump (first 32 bytes): + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + [] __kmalloc+0x4d/0x150 + [] ubifs_mount+0x307b/0x7170 [ubifs] + [] legacy_get_tree+0xed/0x1d0 + [] vfs_get_tree+0x7d/0x230 + [] path_mount+0xdd4/0x17b0 + [] __x64_sys_mount+0x1fa/0x270 + [] do_syscall_64+0x35/0x80 + [] entry_SYSCALL_64_after_hwframe+0x46/0xb0 + + unreferenced object 0xffff8881798a6e00 (size 512): + comm "mount", pid 19677, jiffies 4297121912 (age 37.816s) + hex dump (first 32 bytes): + 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk + 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk + backtrace: + [] __kmalloc+0x4d/0x150 + [] ubifs_wbuf_init+0x52/0x480 [ubifs] + [] ubifs_mount+0x31f5/0x7170 [ubifs] + [] legacy_get_tree+0xed/0x1d0 + [] vfs_get_tree+0x7d/0x230 + [] path_mount+0xdd4/0x17b0 + [] __x64_sys_mount+0x1fa/0x270 + [] do_syscall_64+0x35/0x80 + [] entry_SYSCALL_64_after_hwframe+0x46/0xb0 + +The problem is that the ubifs_wbuf_init() returns an error in the +loop which in the alloc_wbufs(), then the wbuf->buf and wbuf->inodes +that were successfully alloced before are not freed. + +Fix it by adding error hanging path in alloc_wbufs() which frees +the memory alloced before when ubifs_wbuf_init() returns an error. + +Fixes: 1e51764a3c2a ("UBIFS: add new flash file system") +Signed-off-by: Li Zetao +Reviewed-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/super.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c +index b37c6b1e33253..29526040ad774 100644 +--- a/fs/ubifs/super.c ++++ b/fs/ubifs/super.c +@@ -815,7 +815,7 @@ static int alloc_wbufs(struct ubifs_info *c) + INIT_LIST_HEAD(&c->jheads[i].buds_list); + err = ubifs_wbuf_init(c, &c->jheads[i].wbuf); + if (err) +- return err; ++ goto out_wbuf; + + c->jheads[i].wbuf.sync_callback = &bud_wbuf_callback; + c->jheads[i].wbuf.jhead = i; +@@ -823,7 +823,7 @@ static int alloc_wbufs(struct ubifs_info *c) + c->jheads[i].log_hash = ubifs_hash_get_desc(c); + if (IS_ERR(c->jheads[i].log_hash)) { + err = PTR_ERR(c->jheads[i].log_hash); +- goto out; ++ goto out_log_hash; + } + } + +@@ -836,9 +836,18 @@ static int alloc_wbufs(struct ubifs_info *c) + + return 0; + +-out: +- while (i--) ++out_log_hash: ++ kfree(c->jheads[i].wbuf.buf); ++ kfree(c->jheads[i].wbuf.inodes); ++ ++out_wbuf: ++ while (i--) { ++ kfree(c->jheads[i].wbuf.buf); ++ kfree(c->jheads[i].wbuf.inodes); + kfree(c->jheads[i].log_hash); ++ } ++ kfree(c->jheads); ++ c->jheads = NULL; + + return err; + } +-- +2.39.2 + diff --git a/queue-5.4/ubifs-fix-wrong-dirty-space-budget-for-dirty-inode.patch b/queue-5.4/ubifs-fix-wrong-dirty-space-budget-for-dirty-inode.patch new file mode 100644 index 00000000000..a20bbf95971 --- /dev/null +++ b/queue-5.4/ubifs-fix-wrong-dirty-space-budget-for-dirty-inode.patch @@ -0,0 +1,37 @@ +From 25a7be6e205ada572db219e03fa37765dccd4807 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Oct 2022 11:47:30 +0800 +Subject: ubifs: Fix wrong dirty space budget for dirty inode + +From: Zhihao Cheng + +[ Upstream commit b248eaf049d9cdc5eb76b59399e4d3de233f02ac ] + +Each dirty inode should reserve 'c->bi.inode_budget' bytes in space +budget calculation. Currently, space budget for dirty inode reports +more space than what UBIFS actually needs to write. + +Fixes: 1e51764a3c2ac0 ("UBIFS: add new flash file system") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/budget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c +index c0b84e960b20c..bdb79be6dc0e2 100644 +--- a/fs/ubifs/budget.c ++++ b/fs/ubifs/budget.c +@@ -403,7 +403,7 @@ static int calc_dd_growth(const struct ubifs_info *c, + dd_growth = req->dirtied_page ? c->bi.page_budget : 0; + + if (req->dirtied_ino) +- dd_growth += c->bi.inode_budget << (req->dirtied_ino - 1); ++ dd_growth += c->bi.inode_budget * req->dirtied_ino; + if (req->mod_dent) + dd_growth += c->bi.dent_budget; + dd_growth += req->dirtied_ino_d; +-- +2.39.2 + diff --git a/queue-5.4/ubifs-re-statistic-cleaned-znode-count-if-commit-fai.patch b/queue-5.4/ubifs-re-statistic-cleaned-znode-count-if-commit-fai.patch new file mode 100644 index 00000000000..e60cb79a1b9 --- /dev/null +++ b/queue-5.4/ubifs-re-statistic-cleaned-znode-count-if-commit-fai.patch @@ -0,0 +1,86 @@ +From 83ba62f3f125db2d9de71712db393b86564219a7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Nov 2022 17:02:35 +0800 +Subject: ubifs: Re-statistic cleaned znode count if commit failed + +From: Zhihao Cheng + +[ Upstream commit 944e096aa24071d3fe22822f6249d3ae309e39ea ] + +Dirty znodes will be written on flash in committing process with +following states: + + process A | znode state +------------------------------------------------------ +do_commit | DIRTY_ZNODE + ubifs_tnc_start_commit | DIRTY_ZNODE + get_znodes_to_commit | DIRTY_ZNODE | COW_ZNODE + layout_commit | DIRTY_ZNODE | COW_ZNODE + fill_gap | 0 + write master | 0 or OBSOLETE_ZNODE + + process B | znode state +------------------------------------------------------ +do_commit | DIRTY_ZNODE[1] + ubifs_tnc_start_commit | DIRTY_ZNODE + get_znodes_to_commit | DIRTY_ZNODE | COW_ZNODE + ubifs_tnc_end_commit | DIRTY_ZNODE | COW_ZNODE + write_index | 0 + write master | 0 or OBSOLETE_ZNODE[2] or + | DIRTY_ZNODE[3] + +[1] znode is dirtied without concurrent committing process +[2] znode is copied up (re-dirtied by other process) before cleaned + up in committing process +[3] znode is re-dirtied after cleaned up in committing process + +Currently, the clean znode count is updated in free_obsolete_znodes(), +which is called only in normal path. If do_commit failed, clean znode +count won't be updated, which triggers a failure ubifs assertion[4] in +ubifs_tnc_close(): + ubifs_assert_failed [ubifs]: UBIFS assert failed: freed == n + +[4] Commit 380347e9ca7682 ("UBIFS: Add an assertion for clean_zn_cnt"). + +Fix it by re-statisticing cleaned znode count in tnc_destroy_cnext(). + +Fetch a reproducer in [Link]. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216704 +Fixes: 1e51764a3c2a ("UBIFS: add new flash file system") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/tnc.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c +index 33742ee3945b3..b162561ca9c31 100644 +--- a/fs/ubifs/tnc.c ++++ b/fs/ubifs/tnc.c +@@ -3054,6 +3054,21 @@ static void tnc_destroy_cnext(struct ubifs_info *c) + cnext = cnext->cnext; + if (ubifs_zn_obsolete(znode)) + kfree(znode); ++ else if (!ubifs_zn_cow(znode)) { ++ /* ++ * Don't forget to update clean znode count after ++ * committing failed, because ubifs will check this ++ * count while closing tnc. Non-obsolete znode could ++ * be re-dirtied during committing process, so dirty ++ * flag is untrustable. The flag 'COW_ZNODE' is set ++ * for each dirty znode before committing, and it is ++ * cleared as long as the znode become clean, so we ++ * can statistic clean znode count according to this ++ * flag. ++ */ ++ atomic_long_inc(&c->clean_zn_cnt); ++ atomic_long_inc(&ubifs_clean_zn_cnt); ++ } + } while (cnext && cnext != c->cnext); + } + +-- +2.39.2 + diff --git a/queue-5.4/ubifs-rectify-space-budget-for-ubifs_symlink-if-syml.patch b/queue-5.4/ubifs-rectify-space-budget-for-ubifs_symlink-if-syml.patch new file mode 100644 index 00000000000..33265ba25d7 --- /dev/null +++ b/queue-5.4/ubifs-rectify-space-budget-for-ubifs_symlink-if-syml.patch @@ -0,0 +1,48 @@ +From ecab27b1f65ad54d8211d145cbdaf985919be994 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Oct 2022 11:47:27 +0800 +Subject: ubifs: Rectify space budget for ubifs_symlink() if symlink is + encrypted + +From: Zhihao Cheng + +[ Upstream commit c2c36cc6ca23e614f9e4238d0ecf48549ee9002a ] + +Fix bad space budget when symlink file is encrypted. Bad space budget +may let make_reservation() return with -ENOSPC, which could turn ubifs +to read-only mode in do_writepage() process. + +Fetch a reproducer in [Link]. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216490 +Fixes: ca7f85be8d6cf9 ("ubifs: Add support for encrypted symlinks") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/dir.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c +index 83a173feb6989..0c012f8fabbb2 100644 +--- a/fs/ubifs/dir.c ++++ b/fs/ubifs/dir.c +@@ -1125,7 +1125,6 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, + int err, sz_change, len = strlen(symname); + struct fscrypt_str disk_link; + struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, +- .new_ino_d = ALIGN(len, 8), + .dirtied_ino = 1 }; + struct fscrypt_name nm; + +@@ -1141,6 +1140,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, + * Budget request settings: new inode, new direntry and changing parent + * directory inode. + */ ++ req.new_ino_d = ALIGN(disk_link.len - 1, 8); + err = ubifs_budget_space(c, &req); + if (err) + return err; +-- +2.39.2 + diff --git a/queue-5.4/ubifs-rectify-space-budget-for-ubifs_xrename.patch b/queue-5.4/ubifs-rectify-space-budget-for-ubifs_xrename.patch new file mode 100644 index 00000000000..841f5ee90d6 --- /dev/null +++ b/queue-5.4/ubifs-rectify-space-budget-for-ubifs_xrename.patch @@ -0,0 +1,51 @@ +From 83c45ff96302da88b89a205d212f5a93df82d20b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Oct 2022 11:47:28 +0800 +Subject: ubifs: Rectify space budget for ubifs_xrename() + +From: Zhihao Cheng + +[ Upstream commit 1b2ba09060e41adb356b9ae58ef94a7390928004 ] + +There is no space budget for ubifs_xrename(). It may let +make_reservation() return with -ENOSPC, which could turn +ubifs to read-only mode in do_writepage() process. +Fix it by adding space budget for ubifs_xrename(). + +Fetch a reproducer in [Link]. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216569 +Fixes: 9ec64962afb170 ("ubifs: Implement RENAME_EXCHANGE") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/dir.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c +index 0c012f8fabbb2..9a4f9563aceea 100644 +--- a/fs/ubifs/dir.c ++++ b/fs/ubifs/dir.c +@@ -1538,6 +1538,10 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, + return err; + } + ++ err = ubifs_budget_space(c, &req); ++ if (err) ++ goto out; ++ + lock_4_inodes(old_dir, new_dir, NULL, NULL); + + time = current_time(old_dir); +@@ -1563,6 +1567,7 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, + unlock_4_inodes(old_dir, new_dir, NULL, NULL); + ubifs_release_budget(c, &req); + ++out: + fscrypt_free_filename(&fst_nm); + fscrypt_free_filename(&snd_nm); + return err; +-- +2.39.2 + diff --git a/queue-5.4/ubifs-reserve-one-leb-for-each-journal-head-while-do.patch b/queue-5.4/ubifs-reserve-one-leb-for-each-journal-head-while-do.patch new file mode 100644 index 00000000000..6b3e9293281 --- /dev/null +++ b/queue-5.4/ubifs-reserve-one-leb-for-each-journal-head-while-do.patch @@ -0,0 +1,65 @@ +From eac6cb54bb59a9fff97e1c0aafc4dae7f4790ad3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Oct 2022 11:47:32 +0800 +Subject: ubifs: Reserve one leb for each journal head while doing budget + +From: Zhihao Cheng + +[ Upstream commit e874dcde1cbf82c786c0e7f2899811c02630cc52 ] + +UBIFS calculates available space by c->main_bytes - c->lst.total_used +(which means non-index lebs' free and dirty space is accounted into +total available), then index lebs and four lebs (one for gc_lnum, one +for deletions, two for journal heads) are deducted. +In following situation, ubifs may get -ENOSPC from make_reservation(): + LEB 84: DATAHD free 122880 used 1920 dirty 2176 dark 6144 + LEB 110:DELETION free 126976 used 0 dirty 0 dark 6144 (empty) + LEB 201:gc_lnum free 126976 used 0 dirty 0 dark 6144 + LEB 272:GCHD free 77824 used 47672 dirty 1480 dark 6144 + LEB 356:BASEHD free 0 used 39776 dirty 87200 dark 6144 + OTHERS: index lebs, zero-available non-index lebs + +UBIFS calculates the available bytes is 6888 (How to calculate it: +126976 * 5[remain main bytes] - 1920[used] - 47672[used] - 39776[used] - +126976 * 1[deletions] - 126976 * 1[gc_lnum] - 126976 * 2[journal heads] +- 6144 * 5[dark] = 6888) after doing budget, however UBIFS cannot use +BASEHD's dirty space(87200), because UBIFS cannot find next BASEHD to +reclaim current BASEHD. (c->bi.min_idx_lebs equals to c->lst.idx_lebs, +the empty leb won't be found by ubifs_find_free_space(), and dirty index +lebs won't be picked as gced lebs. All non-index lebs has dirty space +less then c->dead_wm, non-index lebs won't be picked as gced lebs +either. So new free lebs won't be produced.). See more details in Link. + +To fix it, reserve one leb for each journal head while doing budget. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216562 +Fixes: 1e51764a3c2ac0 ("UBIFS: add new flash file system") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/budget.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c +index bdb79be6dc0e2..9cb05ef9b9dd9 100644 +--- a/fs/ubifs/budget.c ++++ b/fs/ubifs/budget.c +@@ -212,11 +212,10 @@ long long ubifs_calc_available(const struct ubifs_info *c, int min_idx_lebs) + subtract_lebs += 1; + + /* +- * The GC journal head LEB is not really accessible. And since +- * different write types go to different heads, we may count only on +- * one head's space. ++ * Since different write types go to different heads, we should ++ * reserve one leb for each head. + */ +- subtract_lebs += c->jhead_cnt - 1; ++ subtract_lebs += c->jhead_cnt; + + /* We also reserve one LEB for deletions, which bypass budgeting */ + subtract_lebs += 1; +-- +2.39.2 + diff --git a/queue-5.4/ubifs-ubifs_writepage-mark-page-dirty-after-writing-.patch b/queue-5.4/ubifs-ubifs_writepage-mark-page-dirty-after-writing-.patch new file mode 100644 index 00000000000..7e607762f8c --- /dev/null +++ b/queue-5.4/ubifs-ubifs_writepage-mark-page-dirty-after-writing-.patch @@ -0,0 +1,114 @@ +From 1cc7106267ad7fb4197e6719ed3d2ae034e0558a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jun 2022 10:59:59 +0800 +Subject: ubifs: ubifs_writepage: Mark page dirty after writing inode failed + +From: Zhihao Cheng + +[ Upstream commit fb8bc4c74ae4526d9489362ab2793a936d072b84 ] + +There are two states for ubifs writing pages: +1. Dirty, Private +2. Not Dirty, Not Private + +There is a third possibility which maybe related to [1] that page is +private but not dirty caused by following process: + + PA +lock(page) +ubifs_write_end + attach_page_private // set Private + __set_page_dirty_nobuffers // set Dirty +unlock(page) + +write_cache_pages + lock(page) + clear_page_dirty_for_io(page) // clear Dirty + ubifs_writepage + write_inode + // fail, goto out, following codes are not executed + // do_writepage + // set_page_writeback // set Writeback + // detach_page_private // clear Private + // end_page_writeback // clear Writeback + out: + unlock(page) // Private, Not Dirty + + PB + ksys_fadvise64_64 + generic_fadvise + invalidate_inode_page + // page is neither Dirty nor Writeback + invalidate_complete_page + // page_has_private is true + try_to_release_page + ubifs_releasepage + ubifs_assert(c, 0) !!! + +Then we may get following assertion failed: + UBIFS error (ubi0:0 pid 1492): ubifs_assert_failed [ubifs]: + UBIFS assert failed: 0, in fs/ubifs/file.c:1499 + UBIFS warning (ubi0:0 pid 1492): ubifs_ro_mode [ubifs]: + switched to read-only mode, error -22 + CPU: 2 PID: 1492 Comm: aa Not tainted 5.16.0-rc2-00012-g7bb767dee0ba-dirty + Call Trace: + dump_stack+0x13/0x1b + ubifs_ro_mode+0x54/0x60 [ubifs] + ubifs_assert_failed+0x4b/0x80 [ubifs] + ubifs_releasepage+0x7e/0x1e0 [ubifs] + try_to_release_page+0x57/0xe0 + invalidate_inode_page+0xfb/0x130 + invalidate_mapping_pagevec+0x12/0x20 + generic_fadvise+0x303/0x3c0 + vfs_fadvise+0x35/0x40 + ksys_fadvise64_64+0x4c/0xb0 + +Jump [2] to find a reproducer. + +[1] https://linux-mtd.infradead.narkive.com/NQoBeT1u/patch-rfc-ubifs-fix-assert-failed-in-ubifs-set-page-dirty +[2] https://bugzilla.kernel.org/show_bug.cgi?id=215357 + +Fixes: 1e51764a3c2ac0 ("UBIFS: add new flash file system") +Signed-off-by: Zhihao Cheng +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/ubifs/file.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c +index 6069c63d833ae..177cd4a751ebb 100644 +--- a/fs/ubifs/file.c ++++ b/fs/ubifs/file.c +@@ -1031,7 +1031,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) + if (page->index >= synced_i_size >> PAGE_SHIFT) { + err = inode->i_sb->s_op->write_inode(inode, NULL); + if (err) +- goto out_unlock; ++ goto out_redirty; + /* + * The inode has been written, but the write-buffer has + * not been synchronized, so in case of an unclean +@@ -1059,11 +1059,17 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) + if (i_size > synced_i_size) { + err = inode->i_sb->s_op->write_inode(inode, NULL); + if (err) +- goto out_unlock; ++ goto out_redirty; + } + + return do_writepage(page, len); +- ++out_redirty: ++ /* ++ * redirty_page_for_writepage() won't call ubifs_dirty_inode() because ++ * it passes I_DIRTY_PAGES flag while calling __mark_inode_dirty(), so ++ * there is no need to do space budget for dirty inode. ++ */ ++ redirty_page_for_writepage(wbc, page); + out_unlock: + unlock_page(page); + return err; +-- +2.39.2 + diff --git a/queue-5.4/um-vector-fix-memory-leak-in-vector_config.patch b/queue-5.4/um-vector-fix-memory-leak-in-vector_config.patch new file mode 100644 index 00000000000..52b2331b1b2 --- /dev/null +++ b/queue-5.4/um-vector-fix-memory-leak-in-vector_config.patch @@ -0,0 +1,36 @@ +From 7445f318e683321c09729834e52581ff5375dd8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Nov 2022 15:32:25 +0800 +Subject: um: vector: Fix memory leak in vector_config + +From: Xiang Yang + +[ Upstream commit 8f88c73afe481f93d40801596927e8c0047b6d96 ] + +If the return value of the uml_parse_vector_ifspec function is NULL, +we should call kfree(params) to prevent memory leak. + +Fixes: 49da7e64f33e ("High Performance UML Vector Network Driver") +Signed-off-by: Xiang Yang +Acked-By: Anton Ivanov +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + arch/um/drivers/vector_kern.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c +index 769ffbd9e9a61..eb9dba8dcf958 100644 +--- a/arch/um/drivers/vector_kern.c ++++ b/arch/um/drivers/vector_kern.c +@@ -746,6 +746,7 @@ static int vector_config(char *str, char **error_out) + + if (parsed == NULL) { + *error_out = "vector_config failed to parse parameters"; ++ kfree(params); + return -EINVAL; + } + +-- +2.39.2 + diff --git a/queue-5.4/usb-ene_usb6250-allocate-enough-memory-for-full-obje.patch b/queue-5.4/usb-ene_usb6250-allocate-enough-memory-for-full-obje.patch new file mode 100644 index 00000000000..bd47b2a2350 --- /dev/null +++ b/queue-5.4/usb-ene_usb6250-allocate-enough-memory-for-full-obje.patch @@ -0,0 +1,61 @@ +From 45013dee80a0540f1fae6283b6a1f54a8d470f9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Feb 2023 10:35:46 -0800 +Subject: USB: ene_usb6250: Allocate enough memory for full object + +From: Kees Cook + +[ Upstream commit ce33e64c1788912976b61314b56935abd4bc97ef ] + +The allocation of PageBuffer is 512 bytes in size, but the dereferencing +of struct ms_bootblock_idi (also size 512) happens at a calculated offset +within the allocation, which means the object could potentially extend +beyond the end of the allocation. Avoid this case by just allocating +enough space to catch any accesses beyond the end. Seen with GCC 13: + +../drivers/usb/storage/ene_ub6250.c: In function 'ms_lib_process_bootblock': +../drivers/usb/storage/ene_ub6250.c:1050:44: warning: array subscript 'struct ms_bootblock_idi[0]' is partly outside array bounds of 'unsigned char[512]' [-Warray-bounds=] + 1050 | if (le16_to_cpu(idi->wIDIgeneralConfiguration) != MS_IDI_GENERAL_CONF) + | ^~ +../include/uapi/linux/byteorder/little_endian.h:37:51: note: in definition of macro '__le16_to_cpu' + 37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) + | ^ +../drivers/usb/storage/ene_ub6250.c:1050:29: note: in expansion of macro 'le16_to_cpu' + 1050 | if (le16_to_cpu(idi->wIDIgeneralConfiguration) != MS_IDI_GENERAL_CONF) + | ^~~~~~~~~~~ +In file included from ../drivers/usb/storage/ene_ub6250.c:5: +In function 'kmalloc', + inlined from 'ms_lib_process_bootblock' at ../drivers/usb/storage/ene_ub6250.c:942:15: +../include/linux/slab.h:580:24: note: at offset [256, 512] into object of size 512 allocated by 'kmalloc_trace' + 580 | return kmalloc_trace( + | ^~~~~~~~~~~~~~ + 581 | kmalloc_caches[kmalloc_type(flags)][index], + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 582 | flags, size); + | ~~~~~~~~~~~~ + +Cc: Alan Stern +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20230204183546.never.849-kees@kernel.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/storage/ene_ub6250.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c +index 9c984f3c7248a..b076260a2ca49 100644 +--- a/drivers/usb/storage/ene_ub6250.c ++++ b/drivers/usb/storage/ene_ub6250.c +@@ -938,7 +938,7 @@ static int ms_lib_process_bootblock(struct us_data *us, u16 PhyBlock, u8 *PageDa + struct ms_lib_type_extdat ExtraData; + struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra; + +- PageBuffer = kmalloc(MS_BYTES_PER_PAGE, GFP_KERNEL); ++ PageBuffer = kzalloc(MS_BYTES_PER_PAGE * 2, GFP_KERNEL); + if (PageBuffer == NULL) + return (u32)-1; + +-- +2.39.2 + diff --git a/queue-5.4/usb-host-xhci-mvebu-iterate-over-array-indexes-inste.patch b/queue-5.4/usb-host-xhci-mvebu-iterate-over-array-indexes-inste.patch new file mode 100644 index 00000000000..18e6de13115 --- /dev/null +++ b/queue-5.4/usb-host-xhci-mvebu-iterate-over-array-indexes-inste.patch @@ -0,0 +1,46 @@ +From 89433bbb4b06bc05ac34c3f4061a1518662ae72a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Feb 2023 10:36:52 -0800 +Subject: usb: host: xhci: mvebu: Iterate over array indexes instead of using + pointer math + +From: Kees Cook + +[ Upstream commit 0fbd2cda92cdb00f72080665554a586f88bca821 ] + +Walking the dram->cs array was seen as accesses beyond the first array +item by the compiler. Instead, use the array index directly. This allows +for run-time bounds checking under CONFIG_UBSAN_BOUNDS as well. Seen +with GCC 13 with -fstrict-flex-arrays: + +In function 'xhci_mvebu_mbus_config', + inlined from 'xhci_mvebu_mbus_init_quirk' at ../drivers/usb/host/xhci-mvebu.c:66:2: +../drivers/usb/host/xhci-mvebu.c:37:28: warning: array subscript 0 is outside array bounds of 'const struct mbus_dram_window[0]' [-Warray-bounds=] + 37 | writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | + | ~~^~~~~~ + +Cc: Mathias Nyman +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20230204183651.never.663-kees@kernel.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-mvebu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c +index f27d5c2c42f31..bb70dcc2f84f4 100644 +--- a/drivers/usb/host/xhci-mvebu.c ++++ b/drivers/usb/host/xhci-mvebu.c +@@ -33,7 +33,7 @@ static void xhci_mvebu_mbus_config(void __iomem *base, + + /* Program each DRAM CS in a seperate window */ + for (win = 0; win < dram->num_cs; win++) { +- const struct mbus_dram_window *cs = dram->cs + win; ++ const struct mbus_dram_window *cs = &dram->cs[win]; + + writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | + (dram->mbus_dram_target_id << 4) | 1, +-- +2.39.2 + diff --git a/queue-5.4/usb-uvc-enumerate-valid-values-for-color-matching.patch b/queue-5.4/usb-uvc-enumerate-valid-values-for-color-matching.patch new file mode 100644 index 00000000000..f831254df8d --- /dev/null +++ b/queue-5.4/usb-uvc-enumerate-valid-values-for-color-matching.patch @@ -0,0 +1,67 @@ +From cb7ed99f0cb3f785e0e7e6e3d504b6c7e6204129 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Feb 2023 11:41:37 +0000 +Subject: usb: uvc: Enumerate valid values for color matching + +From: Daniel Scally + +[ Upstream commit e16cab9c1596e251761d2bfb5e1467950d616963 ] + +The color matching descriptors defined in the UVC Specification +contain 3 fields with discrete numeric values representing particular +settings. Enumerate those values so that later code setting them can +be more readable. + +Reviewed-by: Laurent Pinchart +Signed-off-by: Daniel Scally +Link: https://lore.kernel.org/r/20230202114142.300858-2-dan.scally@ideasonboard.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + include/uapi/linux/usb/video.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h +index bfdae12cdacf8..c58854fb7d94a 100644 +--- a/include/uapi/linux/usb/video.h ++++ b/include/uapi/linux/usb/video.h +@@ -179,6 +179,36 @@ + #define UVC_CONTROL_CAP_AUTOUPDATE (1 << 3) + #define UVC_CONTROL_CAP_ASYNCHRONOUS (1 << 4) + ++/* 3.9.2.6 Color Matching Descriptor Values */ ++enum uvc_color_primaries_values { ++ UVC_COLOR_PRIMARIES_UNSPECIFIED, ++ UVC_COLOR_PRIMARIES_BT_709_SRGB, ++ UVC_COLOR_PRIMARIES_BT_470_2_M, ++ UVC_COLOR_PRIMARIES_BT_470_2_B_G, ++ UVC_COLOR_PRIMARIES_SMPTE_170M, ++ UVC_COLOR_PRIMARIES_SMPTE_240M, ++}; ++ ++enum uvc_transfer_characteristics_values { ++ UVC_TRANSFER_CHARACTERISTICS_UNSPECIFIED, ++ UVC_TRANSFER_CHARACTERISTICS_BT_709, ++ UVC_TRANSFER_CHARACTERISTICS_BT_470_2_M, ++ UVC_TRANSFER_CHARACTERISTICS_BT_470_2_B_G, ++ UVC_TRANSFER_CHARACTERISTICS_SMPTE_170M, ++ UVC_TRANSFER_CHARACTERISTICS_SMPTE_240M, ++ UVC_TRANSFER_CHARACTERISTICS_LINEAR, ++ UVC_TRANSFER_CHARACTERISTICS_SRGB, ++}; ++ ++enum uvc_matrix_coefficients { ++ UVC_MATRIX_COEFFICIENTS_UNSPECIFIED, ++ UVC_MATRIX_COEFFICIENTS_BT_709, ++ UVC_MATRIX_COEFFICIENTS_FCC, ++ UVC_MATRIX_COEFFICIENTS_BT_470_2_B_G, ++ UVC_MATRIX_COEFFICIENTS_SMPTE_170M, ++ UVC_MATRIX_COEFFICIENTS_SMPTE_240M, ++}; ++ + /* ------------------------------------------------------------------------ + * UVC structures + */ +-- +2.39.2 + diff --git a/queue-5.4/vc_screen-modify-vcs_size-handling-in-vcs_read.patch b/queue-5.4/vc_screen-modify-vcs_size-handling-in-vcs_read.patch new file mode 100644 index 00000000000..8affebd924c --- /dev/null +++ b/queue-5.4/vc_screen-modify-vcs_size-handling-in-vcs_read.patch @@ -0,0 +1,40 @@ +From 87d8e1d7fea46f6f2c921216c412d9075ffc12b5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Feb 2023 15:21:41 -0500 +Subject: vc_screen: modify vcs_size() handling in vcs_read() + +From: George Kennedy + +[ Upstream commit 46d733d0efc79bc8430d63b57ab88011806d5180 ] + +Restore the vcs_size() handling in vcs_read() to what +it had been in previous version. + +Fixes: 226fae124b2d ("vc_screen: move load of struct vc_data pointer in vcs_read() to avoid UAF") +Suggested-by: Jiri Slaby +Signed-off-by: George Kennedy +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + drivers/tty/vt/vc_screen.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c +index eb7208f07345d..90de3331e4a51 100644 +--- a/drivers/tty/vt/vc_screen.c ++++ b/drivers/tty/vt/vc_screen.c +@@ -296,10 +296,8 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) + */ + size = vcs_size(inode); + if (size < 0) { +- if (read) +- break; + ret = size; +- goto unlock_out; ++ break; + } + if (pos >= size) + break; +-- +2.39.2 + diff --git a/queue-5.4/watchdog-at91sam9_wdt-use-devm_request_irq-to-avoid-.patch b/queue-5.4/watchdog-at91sam9_wdt-use-devm_request_irq-to-avoid-.patch new file mode 100644 index 00000000000..bca0af04c7e --- /dev/null +++ b/queue-5.4/watchdog-at91sam9_wdt-use-devm_request_irq-to-avoid-.patch @@ -0,0 +1,46 @@ +From 34fc606085dbff97f00176f7853c1c5573b04d5d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Nov 2022 17:49:50 +0800 +Subject: watchdog: at91sam9_wdt: use devm_request_irq to avoid missing + free_irq() in error path + +From: ruanjinjie + +[ Upstream commit 07bec0e09c1afbab4c5674fd2341f4f52d594f30 ] + +free_irq() is missing in case of error in at91_wdt_init(), use +devm_request_irq to fix that. + +Fixes: 5161b31dc39a ("watchdog: at91sam9_wdt: better watchdog support") +Signed-off-by: ruanjinjie +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20221116094950.3141943-1-ruanjinjie@huawei.com +[groeck: Adjust multi-line alignment] +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/at91sam9_wdt.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c +index 292b5a1ca8318..fed7be2464420 100644 +--- a/drivers/watchdog/at91sam9_wdt.c ++++ b/drivers/watchdog/at91sam9_wdt.c +@@ -206,10 +206,9 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt) + "min heartbeat and max heartbeat might be too close for the system to handle it correctly\n"); + + if ((tmp & AT91_WDT_WDFIEN) && wdt->irq) { +- err = request_irq(wdt->irq, wdt_interrupt, +- IRQF_SHARED | IRQF_IRQPOLL | +- IRQF_NO_SUSPEND, +- pdev->name, wdt); ++ err = devm_request_irq(dev, wdt->irq, wdt_interrupt, ++ IRQF_SHARED | IRQF_IRQPOLL | IRQF_NO_SUSPEND, ++ pdev->name, wdt); + if (err) + return err; + } +-- +2.39.2 + diff --git a/queue-5.4/watchdog-fix-kmemleak-in-watchdog_cdev_register.patch b/queue-5.4/watchdog-fix-kmemleak-in-watchdog_cdev_register.patch new file mode 100644 index 00000000000..1edfbc09720 --- /dev/null +++ b/queue-5.4/watchdog-fix-kmemleak-in-watchdog_cdev_register.patch @@ -0,0 +1,91 @@ +From 1fa8f3f1e88ffbb843d8a26995ae9a5f1ae31179 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Nov 2022 01:27:14 +0000 +Subject: watchdog: Fix kmemleak in watchdog_cdev_register + +From: Chen Jun + +[ Upstream commit 13721a2ac66b246f5802ba1b75ad8637e53eeecc ] + +kmemleak reports memory leaks in watchdog_dev_register, as follows: +unreferenced object 0xffff888116233000 (size 2048): + comm ""modprobe"", pid 28147, jiffies 4353426116 (age 61.741s) + hex dump (first 32 bytes): + 80 fa b9 05 81 88 ff ff 08 30 23 16 81 88 ff ff .........0#..... + 08 30 23 16 81 88 ff ff 00 00 00 00 00 00 00 00 .0#............. + backtrace: + [<000000007f001ffd>] __kmem_cache_alloc_node+0x157/0x220 + [<000000006a389304>] kmalloc_trace+0x21/0x110 + [<000000008d640eea>] watchdog_dev_register+0x4e/0x780 [watchdog] + [<0000000053c9f248>] __watchdog_register_device+0x4f0/0x680 [watchdog] + [<00000000b2979824>] watchdog_register_device+0xd2/0x110 [watchdog] + [<000000001f730178>] 0xffffffffc10880ae + [<000000007a1a8bcc>] do_one_initcall+0xcb/0x4d0 + [<00000000b98be325>] do_init_module+0x1ca/0x5f0 + [<0000000046d08e7c>] load_module+0x6133/0x70f0 + ... + +unreferenced object 0xffff888105b9fa80 (size 16): + comm ""modprobe"", pid 28147, jiffies 4353426116 (age 61.741s) + hex dump (first 16 bytes): + 77 61 74 63 68 64 6f 67 31 00 b9 05 81 88 ff ff watchdog1....... + backtrace: + [<000000007f001ffd>] __kmem_cache_alloc_node+0x157/0x220 + [<00000000486ab89b>] __kmalloc_node_track_caller+0x44/0x1b0 + [<000000005a39aab0>] kvasprintf+0xb5/0x140 + [<0000000024806f85>] kvasprintf_const+0x55/0x180 + [<000000009276cb7f>] kobject_set_name_vargs+0x56/0x150 + [<00000000a92e820b>] dev_set_name+0xab/0xe0 + [<00000000cec812c6>] watchdog_dev_register+0x285/0x780 [watchdog] + [<0000000053c9f248>] __watchdog_register_device+0x4f0/0x680 [watchdog] + [<00000000b2979824>] watchdog_register_device+0xd2/0x110 [watchdog] + [<000000001f730178>] 0xffffffffc10880ae + [<000000007a1a8bcc>] do_one_initcall+0xcb/0x4d0 + [<00000000b98be325>] do_init_module+0x1ca/0x5f0 + [<0000000046d08e7c>] load_module+0x6133/0x70f0 + ... + +The reason is that put_device is not be called if cdev_device_add fails +and wdd->id != 0. + +watchdog_cdev_register + wd_data = kzalloc [1] + err = dev_set_name [2] + .. + err = cdev_device_add + if (err) { + if (wdd->id == 0) { // wdd->id != 0 + .. + } + return err; // [1],[2] would be leaked + +To fix it, call put_device in all wdd->id cases. + +Fixes: 72139dfa2464 ("watchdog: Fix the race between the release of watchdog_core_data and cdev") +Signed-off-by: Chen Jun +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20221116012714.102066-1-chenjun102@huawei.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/watchdog_dev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c +index 8494846ccdc5f..c670d13ab3d98 100644 +--- a/drivers/watchdog/watchdog_dev.c ++++ b/drivers/watchdog/watchdog_dev.c +@@ -1016,8 +1016,8 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) + if (wdd->id == 0) { + misc_deregister(&watchdog_miscdev); + old_wd_data = NULL; +- put_device(&wd_data->dev); + } ++ put_device(&wd_data->dev); + return err; + } + +-- +2.39.2 + diff --git a/queue-5.4/watchdog-pcwd_usb-fix-attempting-to-access-uninitial.patch b/queue-5.4/watchdog-pcwd_usb-fix-attempting-to-access-uninitial.patch new file mode 100644 index 00000000000..5172e39a2b4 --- /dev/null +++ b/queue-5.4/watchdog-pcwd_usb-fix-attempting-to-access-uninitial.patch @@ -0,0 +1,64 @@ +From e1657457be0443ea686d9640f08b22057910ce06 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Nov 2022 10:07:06 +0800 +Subject: watchdog: pcwd_usb: Fix attempting to access uninitialized memory +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Li Hua + +[ Upstream commit 7d06c07c67100fd0f8e6b3ab7145ce789f788117 ] + +The stack variable msb and lsb may be used uninitialized in function +usb_pcwd_get_temperature and usb_pcwd_get_timeleft when usb card no response. + +The build waring is: +drivers/watchdog/pcwd_usb.c:336:22: error: ‘lsb’ is used uninitialized in this function [-Werror=uninitialized] + *temperature = (lsb * 9 / 5) + 32; + ~~~~^~~ +drivers/watchdog/pcwd_usb.c:328:21: note: ‘lsb’ was declared here + unsigned char msb, lsb; + ^~~ +cc1: all warnings being treated as errors +scripts/Makefile.build:250: recipe for target 'drivers/watchdog/pcwd_usb.o' failed +make[3]: *** [drivers/watchdog/pcwd_usb.o] Error 1 + +Fixes: b7e04f8c61a4 ("mv watchdog tree under drivers") +Signed-off-by: Li Hua +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20221116020706.70847-1-hucool.lihua@huawei.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/pcwd_usb.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c +index 6727f8ab2d182..ce94b6f354888 100644 +--- a/drivers/watchdog/pcwd_usb.c ++++ b/drivers/watchdog/pcwd_usb.c +@@ -325,7 +325,8 @@ static int usb_pcwd_set_heartbeat(struct usb_pcwd_private *usb_pcwd, int t) + static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, + int *temperature) + { +- unsigned char msb, lsb; ++ unsigned char msb = 0x00; ++ unsigned char lsb = 0x00; + + usb_pcwd_send_command(usb_pcwd, CMD_READ_TEMP, &msb, &lsb); + +@@ -341,7 +342,8 @@ static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, + static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd, + int *time_left) + { +- unsigned char msb, lsb; ++ unsigned char msb = 0x00; ++ unsigned char lsb = 0x00; + + /* Read the time that's left before rebooting */ + /* Note: if the board is not yet armed then we will read 0xFFFF */ +-- +2.39.2 + diff --git a/queue-5.4/x86-um-vdso-add-rcx-and-r11-to-the-syscall-clobber-l.patch b/queue-5.4/x86-um-vdso-add-rcx-and-r11-to-the-syscall-clobber-l.patch new file mode 100644 index 00000000000..28915de7f22 --- /dev/null +++ b/queue-5.4/x86-um-vdso-add-rcx-and-r11-to-the-syscall-clobber-l.patch @@ -0,0 +1,59 @@ +From 7188cb77caefafd63c64463a253230f756dd906c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 24 Dec 2022 00:23:38 +0700 +Subject: x86: um: vdso: Add '%rcx' and '%r11' to the syscall clobber list + +From: Ammar Faizi + +[ Upstream commit 5541992e512de8c9133110809f767bd1b54ee10d ] + +The 'syscall' instruction clobbers '%rcx' and '%r11', but they are not +listed in the inline Assembly that performs the syscall instruction. + +No real bug is found. It wasn't buggy by luck because '%rcx' and '%r11' +are caller-saved registers, and not used in the functions, and the +functions are never inlined. + +Add them to the clobber list for code correctness. + +Fixes: f1c2bb8b9964ed31de988910f8b1cfb586d30091 ("um: implement a x86_64 vDSO") +Signed-off-by: Ammar Faizi +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + arch/x86/um/vdso/um_vdso.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/arch/x86/um/vdso/um_vdso.c b/arch/x86/um/vdso/um_vdso.c +index 891868756a51f..6d5269093f7ce 100644 +--- a/arch/x86/um/vdso/um_vdso.c ++++ b/arch/x86/um/vdso/um_vdso.c +@@ -17,8 +17,10 @@ int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) + { + long ret; + +- asm("syscall" : "=a" (ret) : +- "0" (__NR_clock_gettime), "D" (clock), "S" (ts) : "memory"); ++ asm("syscall" ++ : "=a" (ret) ++ : "0" (__NR_clock_gettime), "D" (clock), "S" (ts) ++ : "rcx", "r11", "memory"); + + return ret; + } +@@ -29,8 +31,10 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) + { + long ret; + +- asm("syscall" : "=a" (ret) : +- "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory"); ++ asm("syscall" ++ : "=a" (ret) ++ : "0" (__NR_gettimeofday), "D" (tv), "S" (tz) ++ : "rcx", "r11", "memory"); + + return ret; + } +-- +2.39.2 +