From: Greg Kroah-Hartman Date: Wed, 26 Jul 2023 04:51:36 +0000 (+0200) Subject: drop ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch from everywhere X-Git-Tag: v5.4.251~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ec7a8a7dd51b806dfa1c6a05cc4ff69500d4f37;p=thirdparty%2Fkernel%2Fstable-queue.git drop ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch from everywhere --- diff --git a/queue-4.14/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch b/queue-4.14/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch deleted file mode 100644 index 30d69658797..00000000000 --- a/queue-4.14/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c4d13222afd8a64bf11bc7ec68645496ee8b54b9 Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Tue, 6 Jun 2023 15:32:03 +0800 -Subject: ext4: fix to check return value of freeze_bdev() in ext4_shutdown() - -From: Chao Yu - -commit c4d13222afd8a64bf11bc7ec68645496ee8b54b9 upstream. - -freeze_bdev() can fail due to a lot of reasons, it needs to check its -reason before later process. - -Fixes: 783d94854499 ("ext4: add EXT4_IOC_GOINGDOWN ioctl") -Cc: stable@kernel.org -Signed-off-by: Chao Yu -Link: https://lore.kernel.org/r/20230606073203.1310389-1-chao@kernel.org -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/ioctl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/fs/ext4/ioctl.c -+++ b/fs/ext4/ioctl.c -@@ -502,6 +502,7 @@ static int ext4_shutdown(struct super_bl - { - struct ext4_sb_info *sbi = EXT4_SB(sb); - __u32 flags; -+ int ret; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; -@@ -519,7 +520,9 @@ static int ext4_shutdown(struct super_bl - - switch (flags) { - case EXT4_GOING_FLAGS_DEFAULT: -- freeze_bdev(sb->s_bdev); -+ ret = freeze_bdev(sb->s_bdev); -+ if (ret) -+ return ret; - set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags); - thaw_bdev(sb->s_bdev, sb); - break; diff --git a/queue-4.14/series b/queue-4.14/series index 25a2e483c23..a41ff4a248b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -103,7 +103,6 @@ tpm-tpm_vtpm_proxy-fix-a-race-condition-in-dev-vtpmx-creation.patch sunrpc-fix-uaf-in-svc_tcp_listen_data_ready.patch perf-intel-pt-fix-cyc-timestamps-after-standalone-cbr.patch ext4-fix-wrong-unit-use-in-ext4_mb_clear_bb.patch -ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch ext4-only-update-i_reserved_data_blocks-on-successful-block-allocation.patch jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch diff --git a/queue-4.19/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch b/queue-4.19/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch deleted file mode 100644 index 2d7511bc7e1..00000000000 --- a/queue-4.19/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c4d13222afd8a64bf11bc7ec68645496ee8b54b9 Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Tue, 6 Jun 2023 15:32:03 +0800 -Subject: ext4: fix to check return value of freeze_bdev() in ext4_shutdown() - -From: Chao Yu - -commit c4d13222afd8a64bf11bc7ec68645496ee8b54b9 upstream. - -freeze_bdev() can fail due to a lot of reasons, it needs to check its -reason before later process. - -Fixes: 783d94854499 ("ext4: add EXT4_IOC_GOINGDOWN ioctl") -Cc: stable@kernel.org -Signed-off-by: Chao Yu -Link: https://lore.kernel.org/r/20230606073203.1310389-1-chao@kernel.org -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/ioctl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/fs/ext4/ioctl.c -+++ b/fs/ext4/ioctl.c -@@ -561,6 +561,7 @@ static int ext4_shutdown(struct super_bl - { - struct ext4_sb_info *sbi = EXT4_SB(sb); - __u32 flags; -+ int ret; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; -@@ -579,7 +580,9 @@ static int ext4_shutdown(struct super_bl - - switch (flags) { - case EXT4_GOING_FLAGS_DEFAULT: -- freeze_bdev(sb->s_bdev); -+ ret = freeze_bdev(sb->s_bdev); -+ if (ret) -+ return ret; - set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags); - thaw_bdev(sb->s_bdev, sb); - break; diff --git a/queue-4.19/series b/queue-4.19/series index acf0de8cbf5..1399eaebaf8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -155,7 +155,6 @@ net-bcmgenet-ensure-mdio-unregistration-has-clocks-enabled.patch sunrpc-fix-uaf-in-svc_tcp_listen_data_ready.patch perf-intel-pt-fix-cyc-timestamps-after-standalone-cbr.patch ext4-fix-wrong-unit-use-in-ext4_mb_clear_bb.patch -ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch ext4-only-update-i_reserved_data_blocks-on-successful-block-allocation.patch jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch diff --git a/queue-5.10/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch b/queue-5.10/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch deleted file mode 100644 index a8774a4a660..00000000000 --- a/queue-5.10/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c4d13222afd8a64bf11bc7ec68645496ee8b54b9 Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Tue, 6 Jun 2023 15:32:03 +0800 -Subject: ext4: fix to check return value of freeze_bdev() in ext4_shutdown() - -From: Chao Yu - -commit c4d13222afd8a64bf11bc7ec68645496ee8b54b9 upstream. - -freeze_bdev() can fail due to a lot of reasons, it needs to check its -reason before later process. - -Fixes: 783d94854499 ("ext4: add EXT4_IOC_GOINGDOWN ioctl") -Cc: stable@kernel.org -Signed-off-by: Chao Yu -Link: https://lore.kernel.org/r/20230606073203.1310389-1-chao@kernel.org -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/ioctl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/fs/ext4/ioctl.c -+++ b/fs/ext4/ioctl.c -@@ -612,6 +612,7 @@ static int ext4_shutdown(struct super_bl - { - struct ext4_sb_info *sbi = EXT4_SB(sb); - __u32 flags; -+ int ret; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; -@@ -630,7 +631,9 @@ static int ext4_shutdown(struct super_bl - - switch (flags) { - case EXT4_GOING_FLAGS_DEFAULT: -- freeze_bdev(sb->s_bdev); -+ ret = freeze_bdev(sb->s_bdev); -+ if (ret) -+ return ret; - set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags); - thaw_bdev(sb->s_bdev, sb); - break; diff --git a/queue-5.10/series b/queue-5.10/series index 21f0a9b8f83..cd6c094c6ee 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -388,7 +388,6 @@ ext4-fix-reusing-stale-buffer-heads-from-last-failed-mounting.patch ext4-fix-wrong-unit-use-in-ext4_mb_clear_bb.patch ext4-get-block-from-bh-in-ext4_free_blocks-for-fast-commit-replay.patch ext4-fix-wrong-unit-use-in-ext4_mb_new_blocks.patch -ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch ext4-only-update-i_reserved_data_blocks-on-successful-block-allocation.patch jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch hwrng-imx-rngc-fix-the-timeout-for-init-and-self-check.patch diff --git a/queue-5.4/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch b/queue-5.4/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch deleted file mode 100644 index a165fae5753..00000000000 --- a/queue-5.4/ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c4d13222afd8a64bf11bc7ec68645496ee8b54b9 Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Tue, 6 Jun 2023 15:32:03 +0800 -Subject: ext4: fix to check return value of freeze_bdev() in ext4_shutdown() - -From: Chao Yu - -commit c4d13222afd8a64bf11bc7ec68645496ee8b54b9 upstream. - -freeze_bdev() can fail due to a lot of reasons, it needs to check its -reason before later process. - -Fixes: 783d94854499 ("ext4: add EXT4_IOC_GOINGDOWN ioctl") -Cc: stable@kernel.org -Signed-off-by: Chao Yu -Link: https://lore.kernel.org/r/20230606073203.1310389-1-chao@kernel.org -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/ioctl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/fs/ext4/ioctl.c -+++ b/fs/ext4/ioctl.c -@@ -573,6 +573,7 @@ static int ext4_shutdown(struct super_bl - { - struct ext4_sb_info *sbi = EXT4_SB(sb); - __u32 flags; -+ int ret; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; -@@ -591,7 +592,9 @@ static int ext4_shutdown(struct super_bl - - switch (flags) { - case EXT4_GOING_FLAGS_DEFAULT: -- freeze_bdev(sb->s_bdev); -+ ret = freeze_bdev(sb->s_bdev); -+ if (ret) -+ return ret; - set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags); - thaw_bdev(sb->s_bdev, sb); - break; diff --git a/queue-5.4/series b/queue-5.4/series index dd7c4f2a847..37d750a5f95 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -233,7 +233,6 @@ misc-fastrpc-create-fastrpc-scalar-with-correct-buffer-count.patch sunrpc-fix-uaf-in-svc_tcp_listen_data_ready.patch erofs-fix-compact-4b-support-for-16k-block-size.patch ext4-fix-wrong-unit-use-in-ext4_mb_clear_bb.patch -ext4-fix-to-check-return-value-of-freeze_bdev-in-ext4_shutdown.patch ext4-only-update-i_reserved_data_blocks-on-successful-block-allocation.patch jfs-jfs_dmap-validate-db_l2nbperpage-while-mounting.patch pci-pm-avoid-putting-elopos-e2-s2-h2-pcie-ports-in-d3cold.patch