From 315608bbdd2f4862d01b646e5b9824c4c4270e0a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 4 May 2014 11:37:46 -0400 Subject: [PATCH] remove queue-3.10/ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch --- ...-bug_on-due-to-handle-ext_max_blocks.patch | 41 ------------------- queue-3.10/series | 1 - 2 files changed, 42 deletions(-) delete mode 100644 queue-3.10/ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch diff --git a/queue-3.10/ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch b/queue-3.10/ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch deleted file mode 100644 index 5a48140c37c..00000000000 --- a/queue-3.10/ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4adb6ab3e0fa71363a5ef229544b2d17de6600d7 Mon Sep 17 00:00:00 2001 -From: Kazuya Mio -Date: Mon, 7 Apr 2014 10:53:28 -0400 -Subject: ext4: FIBMAP ioctl causes BUG_ON due to handle EXT_MAX_BLOCKS - -From: Kazuya Mio - -commit 4adb6ab3e0fa71363a5ef229544b2d17de6600d7 upstream. - -When we try to get 2^32-1 block of the file which has the extent -(ee_block=2^32-2, ee_len=1) with FIBMAP ioctl, it causes BUG_ON -in ext4_ext_put_gap_in_cache(). - -To avoid the problem, ext4_map_blocks() needs to check the file logical block -number. ext4_ext_put_gap_in_cache() called via ext4_map_blocks() cannot -handle 2^32-1 because the maximum file logical block number is 2^32-2. - -Note that ext4_ind_map_blocks() returns -EIO when the block number is invalid. -So ext4_map_blocks() should also return the same errno. - -Signed-off-by: Kazuya Mio -Signed-off-by: "Theodore Ts'o" -Signed-off-by: Greg Kroah-Hartman - ---- - fs/ext4/inode.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/fs/ext4/inode.c -+++ b/fs/ext4/inode.c -@@ -574,6 +574,10 @@ int ext4_map_blocks(handle_t *handle, st - "logical block %lu\n", inode->i_ino, flags, map->m_len, - (unsigned long) map->m_lblk); - -+ /* We can handle the block number less than EXT_MAX_BLOCKS */ -+ if (unlikely(map->m_lblk >= EXT_MAX_BLOCKS)) -+ return -EIO; -+ - /* Lookup extent status tree firstly */ - if (ext4_es_lookup_extent(inode, map->m_lblk, &es)) { - if (ext4_es_is_written(&es) || ext4_es_is_unwritten(&es)) { diff --git a/queue-3.10/series b/queue-3.10/series index 6c8e0c5c237..b818b4dcd0c 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -81,7 +81,6 @@ hung_task-check-the-value-of-sysctl_hung_task_timeout_sec.patch ocfs2-dlm-fix-lock-migration-crash.patch ocfs2-dlm-fix-recovery-hung.patch ocfs2-do-not-put-bh-when-buffer_uptodate-failed.patch -ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch ext4-fix-jbd2-warning-under-heavy-xattr-load.patch ext4-use-i_size_read-in-ext4_unaligned_aio.patch usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch -- 2.47.3