system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 19:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

NTFS: Fix two nasty runlist merging bugs that had gone unnoticed so far.

Browse source 
Thanks to Stefano Picerno for the bug report.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
This commit is contained in:
Anton Altaparmakov 2005-09-08 16:46:55 +01:00
parent 9529d461d0
commit 84d6ebe63f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ntfs/ChangeLog
View file

@ -43,6 +43,8 @@ ToDo/Notes:
- Use ntfs_malloc_nofs_nofail() in the two critical regions in - Use ntfs_malloc_nofs_nofail() in the two critical regions in
fs/ntfs/runlist.c::ntfs_runlists_merge(). This means we no longer fs/ntfs/runlist.c::ntfs_runlists_merge(). This means we no longer
need to panic() if the allocation fails as it now cannot fail. need to panic() if the allocation fails as it now cannot fail.
- Fix two nasty runlist merging bugs that had gone unnoticed so far.
Thanks to Stefano Picerno for the bug report.
2.1.23 - Implement extension of resident files and make writing safe as well as 2.1.23 - Implement extension of resident files and make writing safe as well as
many bug fixes, cleanups, and enhancements... many bug fixes, cleanups, and enhancements...

5
fs/ntfs/runlist.c
View file

@ -542,6 +542,7 @@ runlist_element *ntfs_runlists_merge(runlist_element *drl,
/* Scan to the end of the source runlist. */ /* Scan to the end of the source runlist. */
for (dend = 0; likely(drl[dend].length); dend++) for (dend = 0; likely(drl[dend].length); dend++)
; ;
dend++;
drl = ntfs_rl_realloc(drl, dend, dend + 1); drl = ntfs_rl_realloc(drl, dend, dend + 1);
if (IS_ERR(drl)) if (IS_ERR(drl))
return drl; return drl;
@ -611,8 +612,8 @@ runlist_element *ntfs_runlists_merge(runlist_element *drl,
((drl[dins].vcn + drl[dins].length) <= /* End of hole */ ((drl[dins].vcn + drl[dins].length) <= /* End of hole */
(srl[send - 1].vcn + srl[send - 1].length))); (srl[send - 1].vcn + srl[send - 1].length)));
/* Or we'll lose an end marker */ /* Or we will lose an end marker. */
if (start && finish && (drl[dins].length == 0)) if (finish && !drl[dins].length)
ss++; ss++;
if (marker && (drl[dins].vcn + drl[dins].length > srl[send - 1].vcn)) if (marker && (drl[dins].vcn + drl[dins].length > srl[send - 1].vcn))
finish = FALSE; finish = FALSE;