{"id":11717,"url":"https://patchwork.libcamera.org/api/patches/11717/?format=json","web_url":"https://patchwork.libcamera.org/patch/11717/","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":"<20210325134231.1400051-10-kieran.bingham@ideasonboard.com>","date":"2021-03-25T13:42:27","name":"[libcamera-devel,v3,07/11] libcamera: camera: Report function which fails access control","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"85c4822cf07409e1d57c2164440d768de4bf0010","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/11717/mbox/","series":[{"id":1832,"url":"https://patchwork.libcamera.org/api/series/1832/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1832","date":"2021-03-25T13:42:18","name":"[libcamera-devel,v3,01/11] utils: ipc: proxy: Track IPA with a state machine","version":1,"mbox":"https://patchwork.libcamera.org/series/1832/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11717/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11717/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 C9C97C32E9\n\tfor ;\n\tThu, 25 Mar 2021 13:42:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 84A9F68D79;\n\tThu, 25 Mar 2021 14:42:48 +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 5675368D6D\n\tfor ;\n\tThu, 25 Mar 2021 14:42:38 +0100 (CET)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F177F8C9;\n\tThu, 25 Mar 2021 14:42:37 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"kTUJlEUP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1616679758;\n\tbh=Bo5mxA6szGRlwnU8mKkgLU3L3+ybPx3+GNMM9XEOCac=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=kTUJlEUPaii7Lwa9vLYXBklFY988p1DgXWhfpwNcNTFqeWKW+vlqqiS2cUwfQxjCJ\n\tlIWqvknEKPpn7KRCtIt3cSa5qRBJ5DR4sN4BC3hSPShKZcxR7BfHuxC7/EWfxEz9Vt\n\tcntArSsrmxgdJ1KQa+TDKjeNcKR17q9vyI1M7PoE=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 25 Mar 2021 13:42:27 +0000","Message-Id":"<20210325134231.1400051-10-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210325134231.1400051-1-kieran.bingham@ideasonboard.com>","References":"<20210325134231.1400051-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 07/11] libcamera: camera: Report\n\tfunction which fails access control","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The camera object has a state machine to ensure calls are only made\nwhen in the correct state. It isn't easy to identify where things happen\nwhen assertions fail so add extra information to make this clearer.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/camera.cpp | 51 +++++++++++++++++++++++-----------------\n 1 file changed, 30 insertions(+), 21 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex b86bff4745b2..336ab8695ab3 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -346,8 +346,9 @@ public:\n \t\tconst std::set &streams);\n \t~Private();\n \n-\tint isAccessAllowed(State state, bool allowDisconnected = false) const;\n-\tint isAccessAllowed(State low, State high,\n+\tint isAccessAllowed(const char *from, State state,\n+\t\t\t bool allowDisconnected = false) const;\n+\tint isAccessAllowed(const char *from, State low, State high,\n \t\t\t bool allowDisconnected = false) const;\n \n \tvoid disconnect();\n@@ -384,7 +385,8 @@ static const char *const camera_state_names[] = {\n \t\"Running\",\n };\n \n-int Camera::Private::isAccessAllowed(State state, bool allowDisconnected) const\n+int Camera::Private::isAccessAllowed(const char *from, State state,\n+\t\t\t\t bool allowDisconnected) const\n {\n \tif (!allowDisconnected && disconnected_)\n \t\treturn -ENODEV;\n@@ -395,14 +397,16 @@ int Camera::Private::isAccessAllowed(State state, bool allowDisconnected) const\n \n \tASSERT(static_cast(state) < std::size(camera_state_names));\n \n-\tLOG(Camera, Debug) << \"Camera in \" << camera_state_names[currentState]\n-\t\t\t << \" state trying operation requiring state \"\n-\t\t\t << camera_state_names[state];\n+\tLOG(Camera, Warning) << \"Camera in \" << camera_state_names[currentState]\n+\t\t\t << \" state trying operation [\"\n+\t\t\t << from << \"] requiring state \"\n+\t\t\t << camera_state_names[state];\n \n \treturn -EACCES;\n }\n \n-int Camera::Private::isAccessAllowed(State low, State high,\n+int Camera::Private::isAccessAllowed(const char *from,\n+\t\t\t\t State low, State high,\n \t\t\t\t bool allowDisconnected) const\n {\n \tif (!allowDisconnected && disconnected_)\n@@ -415,10 +419,11 @@ int Camera::Private::isAccessAllowed(State low, State high,\n \tASSERT(static_cast(low) < std::size(camera_state_names) &&\n \t static_cast(high) < std::size(camera_state_names));\n \n-\tLOG(Camera, Debug) << \"Camera in \" << camera_state_names[currentState]\n-\t\t\t << \" state trying operation requiring state between \"\n-\t\t\t << camera_state_names[low] << \" and \"\n-\t\t\t << camera_state_names[high];\n+\tLOG(Camera, Warning) << \"Camera in \" << camera_state_names[currentState]\n+\t\t\t << \" state trying operation [\" << from\n+\t\t\t << \"] requiring state between \"\n+\t\t\t << camera_state_names[low] << \" and \"\n+\t\t\t << camera_state_names[high];\n \n \treturn -EACCES;\n }\n@@ -646,7 +651,7 @@ int Camera::exportFrameBuffers(Stream *stream,\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraConfigured);\n+\tint ret = d->isAccessAllowed(__FUNCTION__, Private::CameraConfigured);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -693,7 +698,7 @@ int Camera::acquire()\n \t * No manual locking is required as PipelineHandler::lock() is\n \t * thread-safe.\n \t */\n-\tint ret = d->isAccessAllowed(Private::CameraAvailable);\n+\tint ret = d->isAccessAllowed(__FUNCTION__, Private::CameraAvailable);\n \tif (ret < 0)\n \t\treturn ret == -EACCES ? -EBUSY : ret;\n \n@@ -726,7 +731,8 @@ int Camera::release()\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraAvailable,\n+\tint ret = d->isAccessAllowed(__FUNCTION__,\n+\t\t\t\t Private::CameraAvailable,\n \t\t\t\t Private::CameraConfigured, true);\n \tif (ret < 0)\n \t\treturn ret == -EACCES ? -EBUSY : ret;\n@@ -805,7 +811,8 @@ std::unique_ptr Camera::generateConfiguration(const StreamR\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraAvailable,\n+\tint ret = d->isAccessAllowed(__FUNCTION__,\n+\t\t\t\t Private::CameraAvailable,\n \t\t\t\t Private::CameraRunning);\n \tif (ret < 0)\n \t\treturn nullptr;\n@@ -866,7 +873,8 @@ int Camera::configure(CameraConfiguration *config)\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraAcquired,\n+\tint ret = d->isAccessAllowed(__FUNCTION__,\n+\t\t\t\t Private::CameraAcquired,\n \t\t\t\t Private::CameraConfigured);\n \tif (ret < 0)\n \t\treturn ret;\n@@ -938,7 +946,8 @@ std::unique_ptr Camera::createRequest(uint64_t cookie)\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraConfigured,\n+\tint ret = d->isAccessAllowed(__FUNCTION__,\n+\t\t\t\t Private::CameraConfigured,\n \t\t\t\t Private::CameraRunning);\n \tif (ret < 0)\n \t\treturn nullptr;\n@@ -972,7 +981,7 @@ int Camera::queueRequest(Request *request)\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraRunning);\n+\tint ret = d->isAccessAllowed(__FUNCTION__, Private::CameraRunning);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -1022,7 +1031,7 @@ int Camera::start(const ControlList *controls)\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraConfigured);\n+\tint ret = d->isAccessAllowed(__FUNCTION__, Private::CameraConfigured);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -1056,7 +1065,7 @@ int Camera::stop()\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tint ret = d->isAccessAllowed(Private::CameraRunning);\n+\tint ret = d->isAccessAllowed(__FUNCTION__, Private::CameraRunning);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -1082,7 +1091,7 @@ void Camera::requestComplete(Request *request)\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \n \t/* Disconnected cameras are still able to complete requests. */\n-\tint ret = d->isAccessAllowed(Private::CameraRunning);\n+\tint ret = d->isAccessAllowed(__FUNCTION__, Private::CameraRunning);\n \tif (ret < 0 && ret != -ENODEV)\n \t\tLOG(Camera, Fatal) << \"Trying to complete a request when stopped\";\n \n","prefixes":["libcamera-devel","v3","07/11"]}