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 (file)
index 0000000..1ca81f6
--- /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 <anprice@redhat.com>
+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 <anprice@redhat.com>
+
+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 <anprice@redhat.com>
+Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 d9b5effb953e9c1de65e8ec00221de77cc9be367..750d6c40199de473d8983e1b6eea0af664536de7 100644 (file)
--- 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