From 4c45e7dd137e00c9662ad2fc21f0d3e484891777 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 3 May 2014 20:56:58 -0400 Subject: [PATCH] remove ocfs2-fix-panic-on-kfree-xattr-name.patch --- .../ocfs2-fix-panic-on-kfree-xattr-name.patch | 47 ------------------- queue-3.10/series | 1 - .../ocfs2-fix-panic-on-kfree-xattr-name.patch | 47 ------------------- queue-3.4/series | 1 - 4 files changed, 96 deletions(-) delete mode 100644 queue-3.10/ocfs2-fix-panic-on-kfree-xattr-name.patch delete mode 100644 queue-3.4/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 index 91c22a28ce7..00000000000 --- 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 -Date: Thu, 3 Apr 2014 14:47:07 -0700 -Subject: ocfs2: fix panic on kfree(xattr->name) - -From: Tetsuo Handa - -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 -Reported-by: Tariq Saeed -Tested-by: Tariq Saeed -Reviewed-by: Srinivas Eeda -Cc: Joel Becker -Cc: Mark Fasheh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - 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 4437ad0a923..6c8e0c5c237 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 -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 index 64f766109f8..00000000000 --- 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 -Date: Thu, 3 Apr 2014 14:47:07 -0700 -Subject: ocfs2: fix panic on kfree(xattr->name) - -From: Tetsuo Handa - -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 -Reported-by: Tariq Saeed -Tested-by: Tariq Saeed -Reviewed-by: Srinivas Eeda -Cc: Joel Becker -Cc: Mark Fasheh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - 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 8b814a0f7ea..a9f65bbd3d9 100644 --- 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 -- 2.47.3