From patchwork Thu Mar 31 15:45:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15592 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 56BDDC3256 for ; Thu, 31 Mar 2022 15:45:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A9B9065631; Thu, 31 Mar 2022 17:45:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648741533; bh=y2xadYNexbxTmTSspByeeHY/7YsXVXyX+p37PKm7CXM=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CvJvNWiWXQEAN3Gx88LWv/dzBJnbSPOAc2gccsif39mbtX9Lihw24/unnKmTIV8Al p+cJKmtuxCMyie5c6x7i/cl0LXJoE8uvGeowsB9V2kmlSj63G+/R+q0us3RQMTxYMO rtovatpY1QqLJmLFCman9u0vVpz4jXkxHUtAFoxA8GQ3oMiSNkp+YBUiQubN5T9DjM v9N6svMwM8gTfdRQD1BQAzOk960YxPradtl+B3C37o4A/uXv4vdqK6K1Am307OVBU0 XCyXlUc3+yI1jjoXt53ikbBTL+nqxKvhCRV1RqdfdiT/kRscysscmlod3Jn2ePB/lM 8FJqcLb9OtVzA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2E8D86559A for ; Thu, 31 Mar 2022 17:45:32 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lz4/Fnt2"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A47A82F7 for ; Thu, 31 Mar 2022 17:45:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648741531; bh=y2xadYNexbxTmTSspByeeHY/7YsXVXyX+p37PKm7CXM=; h=From:To:Subject:Date:From; b=lz4/Fnt2yDm7pHrCpeWF+7RW6BALOZ2A7OjOWoELDHYTw5FKaHG0GUhGiCJOjUPp3 t4YcUcBjjSKCYN52Oo9Ty6eTzNm9WOrPMi7kCqTbBizwko5aX2PPEkWt7nxAzca0dU JhCkKEu5D3wpfQrqunYC2xSURKczZhrOsrmdW1mU= To: libcamera-devel@lists.libcamera.org Date: Thu, 31 Mar 2022 18:45:26 +0300 Message-Id: <20220331154526.27882-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: v4l2_videodevice: Fix potential errno overwrite 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-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The errno variable can potentially be overwritten by operator<<(). Store it in a local variable before logging the error message. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain --- src/libcamera/v4l2_videodevice.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 009f6d55610f..0830be80c553 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -647,14 +647,17 @@ int V4L2VideoDevice::open() */ int V4L2VideoDevice::open(SharedFD handle, enum v4l2_buf_type type) { + int ret; + UniqueFD newFd = handle.dup(); if (!newFd.isValid()) { + ret = -errno; LOG(V4L2, Error) << "Failed to duplicate file handle: " - << strerror(errno); - return -errno; + << strerror(-ret); + return ret; } - int ret = V4L2Device::setFd(std::move(newFd)); + ret = V4L2Device::setFd(std::move(newFd)); if (ret < 0) { LOG(V4L2, Error) << "Failed to set file handle: " << strerror(-ret);