aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2007-01-20 22:16:03 +0100
committerAdrian Bunk <bunk@stusta.de>2007-01-20 22:16:03 +0100
commit01f02a48774e7ec4fedd6efeed0f15cb6f04b78a (patch)
treeb4011087a8aa0d8c35008ce08553ed26680503a7 /fs
parentca634cfa84e5aed7b62af887d1bb921a8cb35e32 (diff)
downloadlinux-linaro-stable-01f02a48774e7ec4fedd6efeed0f15cb6f04b78a.tar.gz
mm: fix bug in set_page_dirty_buffers
This was triggered, but not the fault of, the dirty page accounting patches. Suitable for -stable as well, after it goes upstream. Unable to handle kernel NULL pointer dereference at virtual address 0000004c EIP is at _spin_lock+0x12/0x66 Call Trace: [<401766e7>] __set_page_dirty_buffers+0x15/0xc0 [<401401e7>] set_page_dirty+0x2c/0x51 [<40140db2>] set_page_dirty_balance+0xb/0x3b [<40145d29>] __do_fault+0x1d8/0x279 [<40147059>] __handle_mm_fault+0x125/0x951 [<401133f1>] do_page_fault+0x440/0x59f [<4034d0c1>] error_code+0x39/0x40 [<08048a33>] 0x8048a33 ======================= Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/buffer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 8a17ebb97423..6d8b588a9961 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -840,7 +840,10 @@ EXPORT_SYMBOL(mark_buffer_dirty_inode);
*/
int __set_page_dirty_buffers(struct page *page)
{
- struct address_space * const mapping = page->mapping;
+ struct address_space * const mapping = page_mapping(page);
+
+ if (unlikely(!mapping))
+ return !TestSetPageDirty(page);
spin_lock(&mapping->private_lock);
if (page_has_buffers(page)) {