From patchwork Fri Jun 19 05:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4096 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 23CB1609A7 for ; Fri, 19 Jun 2020 07:42:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="K2fxGWdo"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:e972:d773:e99a:4f79]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9B543556; Fri, 19 Jun 2020 07:42:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592545329; bh=LGblM1q/cDUOsGiN3Djel4GcaxzFDP6hIhNGvI3NTEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K2fxGWdoJyfLe2JzuThUu0YiLVuDsMUaKVAi59Wk7FpQ5/mWIy6QYGpW4h+MlxE7k Wg/M42uOgj5ydLGpigsJZg/oQ2rcqBt497iUygKNOIaiyHyZ26gdL7A52qL3QC2rmK N8stgV/EUjpbDiCiQGWbi+9lJ5P1ZTP/mMNd9q0I= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 19 Jun 2020 14:41:22 +0900 Message-Id: <20200619054123.19052-17-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619054123.19052-1-paul.elder@ideasonboard.com> References: <20200619054123.19052-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 16/17] v4l2: v4l2_camera_proxy: Don't allow buffers to be freed if still mmaped 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: , X-List-Received-Date: Fri, 19 Jun 2020 05:42:10 -0000 In VIDIOC_REQBUFS with count = 0, if the buffers are still mmaped, they should not be allowed to be freed. Add a check for this. Signed-off-by: Paul Elder --- New in v2 - split from "Fix v4l2-compliance streaming tests" --- src/v4l2/v4l2_camera_proxy.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index a7f987a..2eb2fcc 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -467,6 +467,9 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *cf, struct v4l2_requestbuffe memset(arg->reserved, 0, sizeof(arg->reserved)); if (arg->count == 0) { + if (!mmaps_.empty()) + return -EBUSY; + if (vcam_->isRunning()) { for (struct v4l2_buffer &buf : buffers_) buf.flags &= ~(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE);