Patch Detail
Show a patch.
GET /api/1.1/patches/14936/?format=api
{ "id": 14936, "url": "https://patchwork.libcamera.org/api/1.1/patches/14936/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14936/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211201070728.3114247-11-hiroh@chromium.org>", "date": "2021-12-01T07:07:26", "name": "[libcamera-devel,v4,10/12] android: camera_device: Fix variables access without protection", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "62d98795c1390d9876c93acfe42d3f440a451c6c", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14936/mbox/", "series": [ { "id": 2789, "url": "https://patchwork.libcamera.org/api/1.1/series/2789/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2789", "date": "2021-12-01T07:07:16", "name": "Introduce clang thread safety annotations", "version": 4, "mbox": "https://patchwork.libcamera.org/series/2789/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14936/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14936/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 CEEDFBDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Dec 2021 07:07:56 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8748760720;\n\tWed, 1 Dec 2021 08:07:56 +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 DDB1F60720\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Dec 2021 08:07:53 +0100 (CET)", "by mail-pg1-x52c.google.com with SMTP id 137so15552668pgg.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 23:07:53 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:3892:a049:59ba:c772])\n\tby smtp.gmail.com with ESMTPSA id\n\tm10sm16598962pgv.75.2021.11.30.23.07.50\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 30 Nov 2021 23:07:51 -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=\"BhBksRNQ\"; 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=SdRdtSaVWQne/+wW0BuBr2489jUGsU+9DzmNFD9RRSU=;\n\tb=BhBksRNQ52z8DCgmnV0UwKdMSk/zvSR1QqtdqSva7lO2c5e7UCIoEfJ3ZwOy8fO0de\n\tVsZyiyc1BbcixIJcGQFp4Ar5BMVlNpl03pmIaD9salRqNHJO50XN7O7p1QHZtUnO8wFZ\n\tqgFdhdk2D06gWACTGSut95E6teaDkgGX2R+qA=", "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=SdRdtSaVWQne/+wW0BuBr2489jUGsU+9DzmNFD9RRSU=;\n\tb=bzgBuqPzZvxRqKhIZvhDncnVpUbgiM93/6rwOCCVGq3bRAiervYHURrkZb7asl/r94\n\tl5MPoRS6p7+Cw+AeU2T/VO1yIKNPpFLOd/tnJ4iaDHeL/RYcpaE0qcy908U6C5O7b/+F\n\tdQYHTDAPUwZwZba7C+ErIm5eGlMeuSYMfnqvF7ioQgefwJQh9sHtx3gXKD+3dBx6LD3V\n\tI0x24wsrtjbi0kj6jEiKGKolf+X3k1XxmXL+8iHJK9F0MjuVzaAmzxA+ngCB0xyMzf85\n\tvL3fS44VNOGfjYVh+lyrB8kaDELzVCE6DBFS7Tft1t5tdCNTkCiG6XDWllFrBlLboUgd\n\tpIHA==", "X-Gm-Message-State": "AOAM533OUSkkOhyNUUMJE5bYLYf6whnnCeEp26HcX9YFXv491KpLZpis\n\tYXog6XPhefHxmWqGpU+ZoPEkZojT5BE2lA==", "X-Google-Smtp-Source": "ABdhPJwi93Gr9q8pHWYVzJiKGXRAQMzBKPeJUnY8eUKU96QJIgHJNMFJkuRDKrF1N5o6bDdsu1a2LQ==", "X-Received": "by 2002:a63:81c8:: with SMTP id\n\tt191mr3340297pgd.369.1638342472172; \n\tTue, 30 Nov 2021 23:07:52 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 1 Dec 2021 16:07:26 +0900", "Message-Id": "<20211201070728.3114247-11-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc2.393.gf8c9666880-goog", "In-Reply-To": "<20211201070728.3114247-1-hiroh@chromium.org>", "References": "<20211201070728.3114247-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This fixes the code accessing descriptors and\nCamera3RequestDescriptor::pendingStreamsToProcess_ without holding\ndescriptorsMutex_ and Camera3RequestDescriptor::streamProcessMutex_\nin CameraDevice.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/camera_device.cpp | 9 ++++++++-\n 1 file changed, 8 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex d74307a2..c7de5da0 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,9 @@ 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+\n \t\tswitch (cameraStream->type()) {\n \t\tcase CameraStream::Type::Mapped:\n \t\t\t/*\n", "prefixes": [ "libcamera-devel", "v4", "10/12" ] }