{"id":14845,"url":"https://patchwork.libcamera.org/api/patches/14845/?format=json","web_url":"https://patchwork.libcamera.org/patch/14845/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211129114453.3186042-10-hiroh@chromium.org>","date":"2021-11-29T11:44:51","name":"[libcamera-devel,v2,09/11] android: camera_device: Fix variables access without protection","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"068d7cc6e0c4faa54509883335ce58b1ccb2e33e","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14845/mbox/","series":[{"id":2770,"url":"https://patchwork.libcamera.org/api/series/2770/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2770","date":"2021-11-29T11:44:42","name":"Introduce clang thread safety annotations","version":2,"mbox":"https://patchwork.libcamera.org/series/2770/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14845/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14845/checks/","tags":{},"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 6677BC324F\n\tfor ;\n\tMon, 29 Nov 2021 11:45:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 02A60605A4;\n\tMon, 29 Nov 2021 12:45:21 +0100 (CET)","from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com\n\t[IPv6:2607:f8b0:4864:20::52c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3C5ED605B4\n\tfor ;\n\tMon, 29 Nov 2021 12:45:17 +0100 (CET)","by mail-pg1-x52c.google.com with SMTP id j11so5912406pgs.2\n\tfor ;\n\tMon, 29 Nov 2021 03:45:17 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:f254:cda9:46e8:17b7])\n\tby smtp.gmail.com with ESMTPSA id\n\thg4sm17951966pjb.1.2021.11.29.03.45.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 29 Nov 2021 03:45:14 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"gcl9fDDj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=3hURich/YKThkPSvS6bZkc/0Va6fPvKyJyaJXHVlALU=;\n\tb=gcl9fDDjUMS/XbVhHzWIAEX78M+2YfgLFXritbrcKha9Nmq0JLqSckxugrfbzk5e0N\n\tSTzHlr2Yxu2sR0N4qdmFn4KDl11/okmK9a5CttClNRPHqp0OHTGMX5FQCiZZBO/+VzFY\n\tLbvHShWPex7h7NazG2EP2sFLneHxY+le6G4f4=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=3hURich/YKThkPSvS6bZkc/0Va6fPvKyJyaJXHVlALU=;\n\tb=8KfUX8x5BUugUQn2bqt+3hhzGe6PTo/x8O4pXz1a3b3bw1l/5cNYDLVTZf0aufQAOj\n\tnDI2FFF3Isa5/1lz3HnLyQ4qpm+A05+PSXY0qdSH131dhNHQh4EQt8kRakRI2Zu6ppnz\n\t6h08BuGcNwVAteyYq1g5yuiTPYoCV8m+bwGGTRPxZUHCCuZa+4nf7gHte0z1yfJd0f95\n\tw11FnWJnWJ1JJUksZRgC4zhXvQCRkOBziuMyFiXdL0U0MLTJJPwHcvgWUfpWrt5Y+ZSb\n\tB0aYCB/hA/bvC13knSAY20azNmXK5epd29hKliLENxTKmStKMH4kCX6wzRPPwCGq70I8\n\ti4Uw==","X-Gm-Message-State":"AOAM530+0LMUcwHS/1WLiIw6x7Dv+knW9+rbbBbjq1GyD3Rhw/SkEq64\n\twC4BFh8cHjNAsW8+/GkhoI8F8WmV7qz75w==","X-Google-Smtp-Source":"ABdhPJxupCe9ZR4ZpE9W171VeDKCZzpxv8wHOxpkzr2kd8ZYbw4siyJC9+H6dXt54nRyRTfI/6Usgg==","X-Received":"by 2002:a63:4c45:: with SMTP id\n\tm5mr22817120pgl.105.1638186315389; \n\tMon, 29 Nov 2021 03:45:15 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 29 Nov 2021 20:44:51 +0900","Message-Id":"<20211129114453.3186042-10-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211129114453.3186042-1-hiroh@chromium.org>","References":"<20211129114453.3186042-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 09/11] 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This fixes the code accessing descriptors and\nCamera3RequestDescriptor::pendingStreamsToProcess_ without holding\ndescriptorsMutex_ and Camera3RequestDescriptor::streamProcessMutex_\nin CameraDevice.\n\nSigned-off-by: Hirokazu Honda \n---\n src/android/camera_device.cpp | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex f2e0bdbd..59185e7f 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -422,7 +422,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@@ -919,6 +923,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 \t\tswitch (cameraStream->type()) {\n \t\tcase CameraStream::Type::Mapped:\n \t\t\t/*\n","prefixes":["libcamera-devel","v2","09/11"]}