Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

vfs: Don't call attach_nobh_buffers() with an empty list

This is a modification of a patch by Bill Pemberton <wfp5p@virginia.edu>

nobh_write_end() could call attach_nobh_buffers() with head == NULL.
This would result in a trap when attach_nobh_buffers() attempted to
access bh->b_this_page.

This can be illustrated by running the writev01 testcase from LTP on jfs.

This error was introduced by commit 5b41e74a "vfs: fix data leak in
nobh_write_end()". That patch did not take into account that if
PageMappedToDisk() is true upon entry to nobh_write_begin(), then no
buffers will be allocated for the page. In that case, we won't have to
worry about a failed write leaving unitialized data in the page.

Of course, head != NULL implies !page_has_buffers(page), so no need to
test both.

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Dmitri Monakhov <dmonakhov@openvz.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Dave Kleikamp and committed by
Linus Torvalds
d4cf109f 6cec5083

+1 -1
+1 -1
fs/buffer.c
··· 2688 2688 struct buffer_head *bh; 2689 2689 BUG_ON(fsdata != NULL && page_has_buffers(page)); 2690 2690 2691 - if (unlikely(copied < len) && !page_has_buffers(page)) 2691 + if (unlikely(copied < len) && head) 2692 2692 attach_nobh_buffers(page, head); 2693 2693 if (page_has_buffers(page)) 2694 2694 return generic_write_end(file, mapping, pos, len,