delete queue-2.6.33/block-check-for-proper-length-of-iov-entries-earlier-in.patch

3 files changed, 5 insertions, 51 deletions

diff --git a/queue-2.6.33/block-check-for-proper-length-of-iov-entries-earlier-in.patch b/queue-2.6.33/block-check-for-proper-length-of-iov-entries-earlier-in.patch
deleted file mode 100644
index e6daadd..0000000
--- a/queue-2.6.33/block-check-for-proper-length-of-iov-entries-earlier-in.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5478755616ae2ef1ce144dded589b62b2a50d575 Mon Sep 17 00:00:00 2001
-From: Xiaotian Feng <dfeng@redhat.com>
-Date: Mon, 29 Nov 2010 10:03:55 +0100
-Subject: block: check for proper length of iov entries earlier in blk_rq_map_user_iov()
-
-From: Xiaotian Feng <dfeng@redhat.com>
-
-commit 5478755616ae2ef1ce144dded589b62b2a50d575 upstream.
-
-commit 9284bcf checks for proper length of iov entries in
-blk_rq_map_user_iov(). But if the map is unaligned, kernel
-will break out the loop without checking for the proper length.
-So we need to check the proper length before the unalign check.
-
-Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
-Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-Cc: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- block/blk-map.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/block/blk-map.c
-+++ b/block/blk-map.c
-@@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_q
- 	for (i = 0; i < iov_count; i++) {
- 		unsigned long uaddr = (unsigned long)iov[i].iov_base;
- 
-+		if (!iov[i].iov_len)
-+			return -EINVAL;
-+
- 		if (uaddr & queue_dma_alignment(q)) {
- 			unaligned = 1;
- 			break;
- 		}
--		if (!iov[i].iov_len)
--			return -EINVAL;
- 	}
- 
- 	if (unaligned || (q->dma_pad_mask & len) || map_data)
diff --git a/queue-2.6.33/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch b/queue-2.6.33/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch
index 8c29f37..0e615d9 100644
--- a/queue-2.6.33/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch
+++ b/queue-2.6.33/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch
@@ -45,9 +45,13 @@ Cc: Jia Wan <jia.wanj@aliyun-inc.com>
 Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
+ fs/ext4/extents.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/fs/ext4/extents.c
 +++ b/fs/ext4/extents.c
-@@ -2592,6 +2592,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,
+@@ -2566,6 +2566,7 @@ static int ext4_ext_convert_to_initializ
  		ex1 = ex;
  		ex1->ee_len = cpu_to_le16(iblock - ee_block);
  		ext4_ext_mark_uninitialized(ex1);
@@ -55,11 +59,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		ex2 = &newex;
  	}
  	/*
--- 
-1.7.4.1
-
-> --
-> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
-> the body of a message to majordomo@vger.kernel.org
-> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index ae05983..247edfc 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -47,7 +47,6 @@ ahci-enable-sb600-64bit-dma-on-asus-m3a.patch
 hid-usbhid-add-support-for-sigma-micro-chip.patch
 hwmon-w83627ehf-properly-report-thermal-diode-sensors.patch
 x25-prevent-skb-overreads-when-checking-call-user-data.patch
-block-check-for-proper-length-of-iov-entries-earlier-in.patch
 staging-quatech_usb2-potential-lost-wakeup-scenario-in-tiocmiwait.patch
 usb-qcserial-add-device-id-for-hp-un2430-mobile-broadband-module.patch
 xhci-mem.c-check-for-ring-first_seg-null.patch