Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 23:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:CC] Fix releasing VACB when an exception is raised in CcZeroData & CcCopyWrite

Browse source
This commit is contained in:
Jérôme Gardou 2020-12-02 12:28:38 +01:00
parent 7f47f03296
commit c295d6b229
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ntoskrnl/cc/copy.c
View file

@ -557,8 +557,9 @@ CcCopyWrite (
return FALSE; return FALSE;
/* FIXME: Honor FileObject FO_WRITE_THROUGH flag */ /* FIXME: Honor FileObject FO_WRITE_THROUGH flag */
ASSERT((FileOffset->QuadPart + Length) <= SharedCacheMap->SectionSize.QuadPart);
ASSERT((FileOffset->QuadPart + Length) <= SharedCacheMap->FileSize.QuadPart); ASSERT((FileObject->Flags & FO_WRITE_THROUGH) == 0);
CurrentOffset = FileOffset->QuadPart; CurrentOffset = FileOffset->QuadPart;
while(CurrentOffset < WriteEnd) while(CurrentOffset < WriteEnd)
@ -577,7 +578,6 @@ CcCopyWrite (
{ {
if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength)) if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength))
{ {
CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE);
return FALSE; return FALSE;
} }
@ -589,7 +589,8 @@ CcCopyWrite (
} }
_SEH2_FINALLY _SEH2_FINALLY
{ {
CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, TRUE, FALSE); /* Do not mark the VACB as dirty if an exception was raised */
CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, !_SEH2_AbnormalTermination(), FALSE);
} }
_SEH2_END; _SEH2_END;
} }
@ -821,7 +822,6 @@ CcZeroData (
{ {
if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength)) if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength))
{ {
CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE);
return FALSE; return FALSE;
} }
@ -832,7 +832,8 @@ CcZeroData (
} }
_SEH2_FINALLY _SEH2_FINALLY
{ {
CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, TRUE, FALSE); /* Do not mark the VACB as dirty if an exception was raised */
CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, !_SEH2_AbnormalTermination(), FALSE);
} }
_SEH2_END; _SEH2_END;
} }