From patchwork Fri Sep 24 13:05:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13925 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 4EE1ABDC71 for ; Fri, 24 Sep 2021 13:06:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BFC8D6918C; Fri, 24 Sep 2021 15:06:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="IbeQ6xkG"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D99E0687DD for ; Fri, 24 Sep 2021 15:06:06 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.51]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B072D45E; Fri, 24 Sep 2021 15:06:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1632488766; bh=A+r5vrC4JI6iRTRVflqlyBcybsilHp0Wb3GTQ+FC0rw=; h=From:To:Cc:Subject:Date:From; b=IbeQ6xkGU2uwld51tHpSYyocNpKysMIMJtUdoGtEpBd7UAL/5Ifi166CCqzG2pYY3 ePQlQ/PvsDfCVDnJvSSrO8qBbTIKxlGoHxJU8tfIjk4ONMci3smAUiN8AqyYEr2mR/ Ch1s4OuHH3eWQHE8Od+Y0qtkvCvz7LMXbLp7UCUo= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Sep 2021 18:35:59 +0530 Message-Id: <20210924130559.418704-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] android: camera_device: Fix race on queuing capture request 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The Camera3RequestDescriptor containing the capture request is adding to the descriptors_ map after a call to CameraWorker::queueRequest(). This is a race condition since CameraWorker::queueRequest() queues request to libcamera::Camera asynchronously and the addition of the descriptor to the map occurs with std::move(). Hence, it might happen that the async queueRequest() hasn't finished but the descriptor gets std::move()ed. Fix it by adding the descriptor to map first, before CameraWorker::queueRequest(). Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- changes in v2: - Save the pointer first and directly use it to queueRequest() after std::move --- src/android/camera_device.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 21844e51..ab381168 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1065,13 +1065,15 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques state_ = State::Running; } - worker_.queueRequest(descriptor.request_.get()); + CaptureRequest *request = descriptor.request_.get(); { MutexLocker descriptorsLock(descriptorsMutex_); descriptors_[descriptor.request_->cookie()] = std::move(descriptor); } + worker_.queueRequest(request); + return 0; }