From patchwork Mon Jun 20 05:58:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 16284 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C51D2BD808 for ; Mon, 20 Jun 2022 05:58:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1641465633; Mon, 20 Jun 2022 07:58:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1655704697; bh=4pxHvjr/zfTQFucgQtE1IVkBZxBUYhAsFcI7ggwb/0I=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=e+nC0vyUN3o80Z6RAFCdaLkFTR03vQd4FGXM/tpf4KB0OmVgdouqrnonCjEc36/D/ l/TutcwBLJvTM5uLQwiQOvMYblNS3OMXGw5NBhAZaU6uEHSBk/S2B2Nzib+xN03WRA eRdfi284YRraoDZhrGlN+JlZq//JHRmaiugR1kGtiWp3dOj0GNheecv3C6FzHlxH8R yqY7JamhRRBy9BOS789SzBGjebHlTYcespfuEdEfpJWIU5gyPe2aPM/DOb5uiY728s QiMR/lAJliTf9bpEzAsQsAUkmP09Q3z4i/Q5xGNbSttir8pJOQjcDQeFRPgi3Ft/Pn bYiZrRdzUTBWg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E82F86048F for ; Mon, 20 Jun 2022 07:58:15 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="XeWNddj6"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [IPv6:2401:4900:1f3f:e389:cb58:4104:f66:a571]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 60537104; Mon, 20 Jun 2022 07:58:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1655704695; bh=4pxHvjr/zfTQFucgQtE1IVkBZxBUYhAsFcI7ggwb/0I=; h=From:To:Cc:Subject:Date:From; b=XeWNddj6oV6Nxw0NAKuyKVZGv8KxpOjz4Yv5PlzSUWe4mfar1weC6XubLn8kzBPe3 cUTmkcGze/V55WpNUbZU/YamXVTJjXNADkhalufpsmp/fVbUFso7dlpzEi8MjFhpYs VefFueuZod6j/yTfnzPCwlMlkcyRfu2S4wkIn9F4= To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Jun 2022 11:28:09 +0530 Message-Id: <20220620055809.392808-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: camera_manager: Protect cameras_ by mutex in cleanup() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hirokazu Honda CameraManager::Private::cleanup() accesses cameras_ without acquiring mutex_. Fix it. Signed-off-by: Hirokazu Honda Signed-off-by: Umang Jain --- src/libcamera/camera_manager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 70d73822..4492edc3 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -178,7 +178,10 @@ void CameraManager::Private::cleanup() * process deletion requests from the thread's message queue as the event * loop is not in action here. */ + mutex_.lock(); cameras_.clear(); + mutex_.unlock(); + dispatchMessages(Message::Type::DeferredDelete); enumerator_.reset(nullptr);