From: Greg Kroah-Hartman Date: Tue, 2 Jul 2024 09:19:03 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.19.317~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ace2b4e6f38f7c2d5a4056ec7edd0b8ea6bac186;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: nfs-leave-pages-in-the-pagecache-if-readpage-failed.patch pwm-stm32-refuse-too-small-period-requests.patch --- diff --git a/queue-5.4/nfs-leave-pages-in-the-pagecache-if-readpage-failed.patch b/queue-5.4/nfs-leave-pages-in-the-pagecache-if-readpage-failed.patch new file mode 100644 index 00000000000..8bb00208da3 --- /dev/null +++ b/queue-5.4/nfs-leave-pages-in-the-pagecache-if-readpage-failed.patch @@ -0,0 +1,34 @@ +From 0b768a9610c6de9811c6d33900bebfb665192ee1 Mon Sep 17 00:00:00 2001 +From: "Matthew Wilcox (Oracle)" +Date: Mon, 16 May 2022 10:30:09 -0400 +Subject: nfs: Leave pages in the pagecache if readpage failed + +From: Matthew Wilcox (Oracle) + +commit 0b768a9610c6de9811c6d33900bebfb665192ee1 upstream. + +The pagecache handles readpage failing by itself; it doesn't want +filesystems to remove pages from under it. + +Signed-off-by: Matthew Wilcox (Oracle) +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfs/read.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/fs/nfs/read.c ++++ b/fs/nfs/read.c +@@ -103,12 +103,8 @@ static void nfs_readpage_release(struct + if (nfs_error_is_fatal_on_server(error) && error != -ETIMEDOUT) + SetPageError(page); + if (nfs_page_group_sync_on_bit(req, PG_UNLOCKPAGE)) { +- struct address_space *mapping = page_file_mapping(page); +- + if (PageUptodate(page)) + nfs_readpage_to_fscache(inode, page, 0); +- else if (!PageError(page) && !PagePrivate(page)) +- generic_error_remove_page(mapping, page); + unlock_page(page); + } + nfs_release_request(req); diff --git a/queue-5.4/pwm-stm32-refuse-too-small-period-requests.patch b/queue-5.4/pwm-stm32-refuse-too-small-period-requests.patch new file mode 100644 index 00000000000..6b04528d955 --- /dev/null +++ b/queue-5.4/pwm-stm32-refuse-too-small-period-requests.patch @@ -0,0 +1,42 @@ +From c45fcf46ca2368dafe7e5c513a711a6f0f974308 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Fri, 21 Jun 2024 16:37:12 +0200 +Subject: pwm: stm32: Refuse too small period requests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Uwe Kleine-König + +commit c45fcf46ca2368dafe7e5c513a711a6f0f974308 upstream. + +If period_ns is small, prd might well become 0. Catch that case because +otherwise with + + regmap_write(priv->regmap, TIM_ARR, prd - 1); + +a few lines down quite a big period is configured. + +Fixes: 7edf7369205b ("pwm: Add driver for STM32 plaftorm") +Cc: stable@vger.kernel.org +Reviewed-by: Trevor Gamblin +Signed-off-by: Uwe Kleine-König +Link: https://lore.kernel.org/r/b86f62f099983646f97eeb6bfc0117bb2d0c340d.1718979150.git.u.kleine-koenig@baylibre.com +Signed-off-by: Uwe Kleine-König +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pwm/pwm-stm32.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/pwm/pwm-stm32.c ++++ b/drivers/pwm/pwm-stm32.c +@@ -337,6 +337,9 @@ static int stm32_pwm_config(struct stm32 + + prd = div; + ++ if (!prd) ++ return -EINVAL; ++ + if (prescaler > MAX_TIM_PSC) + return -EINVAL; + diff --git a/queue-5.4/series b/queue-5.4/series index 8e4633618af..7b00b16ffaa 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -229,3 +229,5 @@ batman-adv-don-t-accept-tt-entries-for-out-of-spec-vids.patch ata-libata-core-fix-double-free-on-error.patch ftruncate-pass-a-signed-offset.patch mtd-spinand-macronix-add-support-for-serial-nand-flash.patch +pwm-stm32-refuse-too-small-period-requests.patch +nfs-leave-pages-in-the-pagecache-if-readpage-failed.patch