From owner-svn-src-projects@freebsd.org Sat May 21 00:43:11 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60689B44C71 for ; Sat, 21 May 2016 00:43:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 17D031123; Sat, 21 May 2016 00:43:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4L0hAlE017984; Sat, 21 May 2016 00:43:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4L0hAsX017983; Sat, 21 May 2016 00:43:10 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201605210043.u4L0hAsX017983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 21 May 2016 00:43:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300339 - projects/zfsd/head/cddl/usr.sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2016 00:43:11 -0000 Author: asomers Date: Sat May 21 00:43:10 2016 New Revision: 300339 URL: https://svnweb.freebsd.org/changeset/base/300339 Log: Fix a crash bug in zfsd when destroying a pool with I/O errors cddl/usr.sbin/zfsd/case_file.cc CaseFile::ReEvaluateByGuid was calling std::for_each on a std::list of CaseFiles. However, the functor would sometimes remove a CaseFile from the list, which caused a segfault in std::for_each. The solution is to remove the use of for_each. Instead, manually iterate through the list, taking care not to access potentially invalid iterators. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Sat May 21 00:34:54 2016 (r300338) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Sat May 21 00:43:10 2016 (r300339) @@ -89,36 +89,6 @@ using DevdCtl::EventList; using DevdCtl::Guid; using DevdCtl::ParseException; -/*-------------------------- File-scoped classes ----------------------------*/ -/** - * \brief Functor that operators on STL collections of CaseFiles - * - * Selectively calls ReEvaluate on the casefile, based on its pool GUID. - */ -class CaseFileReEvaluator : public std::unary_function -{ -public: - CaseFileReEvaluator(Guid guid, const ZfsEvent &event); - - void operator() (CaseFile *casefile); - -private: - Guid m_poolGUID; - const ZfsEvent &m_event; -}; - -CaseFileReEvaluator::CaseFileReEvaluator(Guid guid, const ZfsEvent &event) - : m_poolGUID(guid), m_event(event) -{ -} - -void -CaseFileReEvaluator::operator() (CaseFile *casefile) -{ - if (m_poolGUID == casefile->PoolGUID()) - casefile->ReEvaluate(m_event); -} - /*--------------------------------- CaseFile ---------------------------------*/ //- CaseFile Static Data ------------------------------------------------------- CaseFileList CaseFile::s_activeCases; @@ -170,8 +140,13 @@ CaseFile::Find(const string &physPath) void CaseFile::ReEvaluateByGuid(Guid poolGUID, const ZfsEvent &event) { - CaseFileReEvaluator reevaluator(poolGUID, event); - std::for_each(s_activeCases.begin(), s_activeCases.end(), reevaluator); + CaseFileList::iterator casefile; + for (casefile = s_activeCases.begin(); casefile != s_activeCases.end();){ + CaseFileList::iterator next = std::next(casefile); + if (poolGUID == (*casefile)->PoolGUID()) + (*casefile)->ReEvaluate(event); + casefile = next; + } } CaseFile &