From 570bc24fb98d72d1bce9261fdc29139224ec86ec Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 8 Jun 2014 17:03:34 +0900 Subject: Fix use-after-free on exit with multi-file torrent download + DHT DefaultPieceStorage may be referenced by one of DHT task (e.g., DHTPeerLookupTask), after RequestGroup was deleted, and even after RequestGroupMan was deleted. DefaultPieceStorage has a reference to MultiDiskAdaptor which calls RequestGroupMan object on destruction. So when DHT task is destroyed, DefaultPieceStorage is destroyed, which in turn destroys MultiDiskAdaptor. DHT task is destroyed after RequestGroupMan was destroyed, MultiDiskAdaptor will use now freed RequestGroupMan object, this is use-after-free. --- src/OpenedFileCounter.cc | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 src/OpenedFileCounter.cc (limited to 'src/OpenedFileCounter.cc') diff --git a/src/OpenedFileCounter.cc b/src/OpenedFileCounter.cc new file mode 100644 index 00000000..c5bdeade --- /dev/null +++ b/src/OpenedFileCounter.cc @@ -0,0 +1,100 @@ +/* */ +#include "OpenedFileCounter.h" + +#include + +#include "RequestGroupMan.h" +#include "RequestGroup.h" +#include "PieceStorage.h" +#include "DiskAdaptor.h" +#include "SimpleRandomizer.h" + +namespace aria2 { + +OpenedFileCounter::OpenedFileCounter(RequestGroupMan* rgman, + size_t maxOpenFiles) + : rgman_(rgman), + maxOpenFiles_(maxOpenFiles), + numOpenFiles_(0) +{} + +void OpenedFileCounter::ensureMaxOpenFileLimit(size_t numNewFiles) +{ + if(!rgman_) { + return; + } + + if(numOpenFiles_ + numNewFiles <= maxOpenFiles_) { + numOpenFiles_ += numNewFiles; + return; + } + assert(numNewFiles <= maxOpenFiles_); + size_t numClose = numOpenFiles_ + numNewFiles - maxOpenFiles_; + size_t left = numClose; + + auto requestGroups = rgman_->getRequestGroups(); + + auto mark = std::begin(requestGroups); + std::advance(mark, + SimpleRandomizer::getInstance()-> + getRandomNumber(requestGroups.size())); + for(auto i = mark; i != std::end(requestGroups) && left > 0; ++i) { + left -= (*i)->getPieceStorage()->getDiskAdaptor()->tryCloseFile(left); + } + for(auto i = std::begin(requestGroups); i != mark && left > 0; ++i) { + left -= (*i)->getPieceStorage()->getDiskAdaptor()->tryCloseFile(left); + } + assert(left == 0); + numOpenFiles_ += numNewFiles - numClose; +} + +void OpenedFileCounter::reduceNumOfOpenedFile(size_t numCloseFiles) +{ + if(!rgman_) { + return; + } + + assert(numOpenFiles_ >= numCloseFiles); + numOpenFiles_ -= numCloseFiles; +} + +void OpenedFileCounter::deactivate() +{ + rgman_ = nullptr; +} + +} // namespace aria2 + -- cgit