Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NTFS: Fix a stupid bug causing writes to non-initialized pages to segfault.

Browse Source 
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
This commit is contained in:
Anton Altaparmakov 2005-11-01 15:49:31 +00:00
parent 1f04c0a24b
commit 3aebf25bdc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ntfs/file.c
View File

@ -668,10 +668,10 @@ map_buffer_cached:
* to, we need to read it in before the write, * to, we need to read it in before the write,
* i.e. now. * i.e. now.
*/ */
if (!buffer_uptodate(bh) && ((bh_pos < pos && if (!buffer_uptodate(bh) && bh_pos < end &&
bh_end > pos) || bh_end > pos &&
(bh_end > end && (bh_pos < pos ||
bh_end > end))) { bh_end > end)) {
/* /*
* If the buffer is fully or partially * If the buffer is fully or partially
* within the initialized size, do an * within the initialized size, do an
@ -784,10 +784,11 @@ retry_remap:
blocksize_bits); blocksize_bits);
cdelta = 0; cdelta = 0;
/* /*
* If the number of remaining clusters in the * If the number of remaining clusters touched
* @pages is smaller or equal to the number of * by the write is smaller or equal to the
* cached clusters, unlock the runlist as the * number of cached clusters, unlock the
* map cache will be used from now on. * runlist as the map cache will be used from
* now on.
*/ */
if (likely(vcn + vcn_len >= cend)) { if (likely(vcn + vcn_len >= cend)) {
if (rl_write_locked) { if (rl_write_locked) {