remove ocfs2-fix-panic-on-kfree-xattr-name.patch

diff --git a/queue-3.10/ocfs2-fix-panic-on-kfree-xattr-name.patch b/queue-3.10/ocfs2-fix-panic-on-kfree-xattr-name.patch
deleted file mode 100644 (file)
index 91c22a2..0000000
--- a/queue-3.10/ocfs2-fix-panic-on-kfree-xattr-name.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f81c20158f8d5f7938d5eb86ecc42ecc09273ce6 Mon Sep 17 00:00:00 2001
-From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Date: Thu, 3 Apr 2014 14:47:07 -0700
-Subject: ocfs2: fix panic on kfree(xattr->name)
-
-From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-
-commit f81c20158f8d5f7938d5eb86ecc42ecc09273ce6 upstream.
-
-Commit 9548906b2bb7 ('xattr: Constify ->name member of "struct xattr"')
-missed that ocfs2 is calling kfree(xattr->name).  As a result, kernel
-panic occurs upon calling kfree(xattr->name) because xattr->name refers
-static constant names.  This patch removes kfree(xattr->name) from
-ocfs2_mknod() and ocfs2_symlink().
-
-Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Reported-by: Tariq Saeed <tariq.x.saeed@oracle.com>
-Tested-by: Tariq Saeed <tariq.x.saeed@oracle.com>
-Reviewed-by: Srinivas Eeda <srinivas.eeda@oracle.com>
-Cc: Joel Becker <jlbec@evilplan.org>
-Cc: Mark Fasheh <mfasheh@suse.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ocfs2/namei.c |    2 --
- 1 file changed, 2 deletions(-)
-
---- a/fs/ocfs2/namei.c
-+++ b/fs/ocfs2/namei.c
-@@ -430,7 +430,6 @@ leave:
- 
-       brelse(new_fe_bh);
-       brelse(parent_fe_bh);
--      kfree(si.name);
-       kfree(si.value);
- 
-       ocfs2_free_dir_lookup_result(&lookup);
-@@ -1817,7 +1816,6 @@ bail:
- 
-       brelse(new_fe_bh);
-       brelse(parent_fe_bh);
--      kfree(si.name);
-       kfree(si.value);
-       ocfs2_free_dir_lookup_result(&lookup);
-       if (inode_ac)

diff --git a/queue-3.10/series b/queue-3.10/series
index 4437ad0a923e40693f5ebfab344d5966825f1b8e..6c8e0c5c237020da7f0989722043a5b7db74cfdb 100644 (file)
--- 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
-ocfs2-fix-panic-on-kfree-xattr-name.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

diff --git a/queue-3.4/ocfs2-fix-panic-on-kfree-xattr-name.patch b/queue-3.4/ocfs2-fix-panic-on-kfree-xattr-name.patch
deleted file mode 100644 (file)
index 64f7661..0000000
--- a/queue-3.4/ocfs2-fix-panic-on-kfree-xattr-name.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f81c20158f8d5f7938d5eb86ecc42ecc09273ce6 Mon Sep 17 00:00:00 2001
-From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Date: Thu, 3 Apr 2014 14:47:07 -0700
-Subject: ocfs2: fix panic on kfree(xattr->name)
-
-From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-
-commit f81c20158f8d5f7938d5eb86ecc42ecc09273ce6 upstream.
-
-Commit 9548906b2bb7 ('xattr: Constify ->name member of "struct xattr"')
-missed that ocfs2 is calling kfree(xattr->name).  As a result, kernel
-panic occurs upon calling kfree(xattr->name) because xattr->name refers
-static constant names.  This patch removes kfree(xattr->name) from
-ocfs2_mknod() and ocfs2_symlink().
-
-Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Reported-by: Tariq Saeed <tariq.x.saeed@oracle.com>
-Tested-by: Tariq Saeed <tariq.x.saeed@oracle.com>
-Reviewed-by: Srinivas Eeda <srinivas.eeda@oracle.com>
-Cc: Joel Becker <jlbec@evilplan.org>
-Cc: Mark Fasheh <mfasheh@suse.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ocfs2/namei.c |    2 --
- 1 file changed, 2 deletions(-)
-
---- a/fs/ocfs2/namei.c
-+++ b/fs/ocfs2/namei.c
-@@ -430,7 +430,6 @@ leave:
- 
-       brelse(new_fe_bh);
-       brelse(parent_fe_bh);
--      kfree(si.name);
-       kfree(si.value);
- 
-       ocfs2_free_dir_lookup_result(&lookup);
-@@ -1816,7 +1815,6 @@ bail:
- 
-       brelse(new_fe_bh);
-       brelse(parent_fe_bh);
--      kfree(si.name);
-       kfree(si.value);
-       ocfs2_free_dir_lookup_result(&lookup);
-       if (inode_ac)

diff --git a/queue-3.4/series b/queue-3.4/series
index 8b814a0f7eada8de545cf692753b4df9d3064922..a9f65bbd3d9725154d94f7d2eeb3b6c4cf5aeaf5 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -39,6 +39,5 @@ 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
-ocfs2-fix-panic-on-kfree-xattr-name.patch
 ext4-use-i_size_read-in-ext4_unaligned_aio.patch
 usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch