From patchwork Thu Apr 1 15:29:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 11815 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 C896BC0DA4 for ; Thu, 1 Apr 2021 15:30:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 44C636877C; Thu, 1 Apr 2021 17:30:12 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VPwF7eBF"; dkim-atps=neutral Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5FE7A6877C for ; Thu, 1 Apr 2021 17:30:11 +0200 (CEST) Received: by mail-pf1-x430.google.com with SMTP id 11so17564pfn.9 for ; Thu, 01 Apr 2021 08:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bra4RlgrIiGjhepP/qVdlpFSAIQoA0wQCSLQPqZHYJU=; b=VPwF7eBFCqmso7kV2ydUcZOjXFO1tWxNBIoVq+xMXNi1UYFnDwPsk9fOoavgUpo0YL +MhrpS53+6dAc1amhKBF58QL4J8a6IldRq1WFeJVpNc0AOmkxoV6dApRENMGEko63cdU iw15jYN97lhCmZnVgSDGDN7azgLGloa7qMQQ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bra4RlgrIiGjhepP/qVdlpFSAIQoA0wQCSLQPqZHYJU=; b=i6YjkbxbcFqZaFWYrgtv6wWVSpbjFfTuSYXg3Q8tyGPB0enyn7T45YV/WUM/HXJDM1 734nkS3SPDJDTs69HyMbFAFi9UF4JRB2DtM8YXBUJS50WHH44bbjyu8VR902RS+Whf+u bEs3hQUdBprU1vxoMaiyI0jujUfrU/MrrDMOE4Zv6EdA8rr45CJyO96Q+pHRlOM+wltG hnoeE9ddEMt8VIkshz8v1h3eRnFmebl24AnFCSijnrxbnuQ4cT6E9ewDQcGKHa8Ppabs /y7tYoWwFU3pQSq3VRlFHX8kIpzDB+BRdSb7+URki4FACBYSk3skkzDT8AohdcM6dj2b hVKw== X-Gm-Message-State: AOAM531RwKJInwezIaB7ie6mXyJvi3wF/K3A3b6IaSBX/mdH0nkLWZHe QNSc6xY0+4pmMIvDwYtitDRCJMn/+p2T4Q== X-Google-Smtp-Source: ABdhPJwEy0Oy6Y7+rb6a/tcbIveixDfguOvTYeMimDoSHQm0dn1jMwPy30CIspx2lWGKkM4RdAN7Xw== X-Received: by 2002:a05:6a00:3:b029:1f3:1959:2e3b with SMTP id h3-20020a056a000003b02901f319592e3bmr7887221pfk.11.1617291009288; Thu, 01 Apr 2021 08:30:09 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:908:1da:b07c:32bc]) by smtp.gmail.com with ESMTPSA id d1sm6172739pjc.24.2021.04.01.08.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 08:30:08 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Fri, 2 Apr 2021 00:29:26 +0900 Message-Id: <20210401152926.1216787-1-hiroh@chromium.org> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: CameraBuffer: Mark as invalid if cros::CameraBufferManager::Register() fails 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" cros::CameraBufferManager::Register() fails if a buffer handle is invalid. We should mark CameraBuffer as invalid on the failure of Register(). Signed-off-by: Hirokazu Honda --- src/android/mm/cros_camera_buffer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index 7df4f47c..d9fd43b7 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -53,7 +53,11 @@ CameraBuffer::Private::Private(CameraBuffer *cameraBuffer, { bufferManager_ = cros::CameraBufferManager::GetInstance(); - bufferManager_->Register(camera3Buffer); + int ret = bufferManager_->Register(camera3Buffer); + if (ret) { + LOG(HAL, Error) << "Failed registering a buffer: " << ret; + return; + } numPlanes_ = bufferManager_->GetNumPlanes(camera3Buffer); switch (numPlanes_) {