From: Greg Kroah-Hartman Date: Sun, 3 Apr 2022 12:40:29 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.17.2~129 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a90d25ff74279dc19a4792cb69012116554236c2;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: gfs2-make-sure-fitrim-minlen-is-rounded-up-to-fs-block-size.patch --- diff --git a/queue-4.14/gfs2-make-sure-fitrim-minlen-is-rounded-up-to-fs-block-size.patch b/queue-4.14/gfs2-make-sure-fitrim-minlen-is-rounded-up-to-fs-block-size.patch new file mode 100644 index 00000000000..1ca81f6f083 --- /dev/null +++ b/queue-4.14/gfs2-make-sure-fitrim-minlen-is-rounded-up-to-fs-block-size.patch @@ -0,0 +1,42 @@ +From 27ca8273fda398638ca994a207323a85b6d81190 Mon Sep 17 00:00:00 2001 +From: Andrew Price +Date: Tue, 22 Mar 2022 19:05:51 +0000 +Subject: gfs2: Make sure FITRIM minlen is rounded up to fs block size + +From: Andrew Price + +commit 27ca8273fda398638ca994a207323a85b6d81190 upstream. + +Per fstrim(8) we must round up the minlen argument to the fs block size. +The current calculation doesn't take into account devices that have a +discard granularity and requested minlen less than 1 fs block, so the +value can get shifted away to zero in the translation to fs blocks. + +The zero minlen passed to gfs2_rgrp_send_discards() then allows +sb_issue_discard() to be called with nr_sects == 0 which returns -EINVAL +and results in gfs2_rgrp_send_discards() returning -EIO. + +Make sure minlen is never < 1 fs block by taking the max of the +requested minlen and the fs block size before comparing to the device's +discard granularity and shifting to fs blocks. + +Fixes: 076f0faa764ab ("GFS2: Fix FITRIM argument handling") +Signed-off-by: Andrew Price +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Greg Kroah-Hartman +--- + fs/gfs2/rgrp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/gfs2/rgrp.c ++++ b/fs/gfs2/rgrp.c +@@ -1380,7 +1380,8 @@ int gfs2_fitrim(struct file *filp, void + + start = r.start >> bs_shift; + end = start + (r.len >> bs_shift); +- minlen = max_t(u64, r.minlen, ++ minlen = max_t(u64, r.minlen, sdp->sd_sb.sb_bsize); ++ minlen = max_t(u64, minlen, + q->limits.discard_granularity) >> bs_shift; + + if (end <= start || minlen > sdp->sd_max_rg_data) diff --git a/queue-4.14/series b/queue-4.14/series index d9b5effb953..750d6c40199 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -193,3 +193,4 @@ ubifs-setflags-make-dirtied_ino_d-8-bytes-aligned.patch ubifs-rename_whiteout-correct-old_dir-size-computing.patch can-mcba_usb-mcba_usb_start_xmit-fix-double-dev_kfree_skb-in-error-path.patch can-mcba_usb-properly-check-endpoint-type.patch +gfs2-make-sure-fitrim-minlen-is-rounded-up-to-fs-block-size.patch