[{"id":21477,"web_url":"https://patchwork.libcamera.org/comment/21477/","msgid":"","date":"2021-12-01T00:21:35","subject":"Re: [libcamera-devel] [PATCH v3 10/12] android: camera_device: Fix\n\tvariables access without protection","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Wed, Dec 01, 2021 at 12:55:58AM +0900, Hirokazu Honda wrote:\n> This fixes the code accessing descriptors and\n> Camera3RequestDescriptor::pendingStreamsToProcess_ without holding\n> descriptorsMutex_ and Camera3RequestDescriptor::streamProcessMutex_\n> in CameraDevice.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> src/android/camera_device.cpp | 8 +++++++-\n> 1 file changed, 7 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index d74307a2..e513cd84 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -421,7 +421,11 @@ void CameraDevice::stop()\n> \tworker_.stop();\n> \tcamera_->stop();\n> \n> -\tdescriptors_ = {};\n> +\t{\n> +\t\tMutexLocker descriptorsLock(descriptorsMutex_);\n> +\t\tdescriptors_ = {};\n> +\t}\n> +\n> \tstreams_.clear();\n> \n> \tstate_ = State::Stopped;\n> @@ -918,6 +922,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\t */\n> \t\tFrameBuffer *frameBuffer = nullptr;\n> \t\tint acquireFence = -1;\n> +\n> +\t\tMutexLocker lock(descriptor->streamsProcessMutex_);\n\nBlank line here ?\n\nWe could lower the amount of code covered by the lock, but that wouldn't\nhelp as there can be lock contention here. I just hope locking and\nunlocking an std::mutex that isn't contended is a fast operation.\n\nReviewed-by: Laurent Pinchart \n\n> \t\tswitch (cameraStream->type()) {\n> \t\tcase CameraStream::Type::Mapped:\n> \t\t\t/*","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0153EBF415\n\tfor ;\n\tWed, 1 Dec 2021 00:22:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D95560720;\n\tWed, 1 Dec 2021 01:22:01 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8678E60592\n\tfor ;\n\tWed, 1 Dec 2021 01:22:00 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 055618AE;\n\tWed, 1 Dec 2021 01:21:59 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"JryRvJUo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638318120;\n\tbh=Ug2Q+rqM923eKNFEsuI9MhcI26Xyro3WrVNwIdDUbvo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=JryRvJUo4vfUtquVIwj8R7XVtLu20X5e+VwDjzEnJ4Pkx0XnEvWYb2baj0na+6Mi+\n\tu3vyjjqLStTHTPJd2zgMSmmaYAeFFL84xjQwajo0hNxfh5JXxc2tTPw7f6HIlBhMx0\n\tpWeRb+RYb1lOK/UnO8kH9lhDuYhpvZpwqICObnC8=","Date":"Wed, 1 Dec 2021 02:21:35 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20211130155600.2203123-1-hiroh@chromium.org>\n\t<20211130155600.2203123-11-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211130155600.2203123-11-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v3 10/12] android: camera_device: Fix\n\tvariables access without protection","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]