From patchwork Thu Oct 23 14:59:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 24764 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 3EECDBE080 for ; Thu, 23 Oct 2025 14:59:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C2015607ED; Thu, 23 Oct 2025 16:59:11 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Ae40GowT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A748607C9 for ; Thu, 23 Oct 2025 16:59:09 +0200 (CEST) Received: from pb-laptop.local (185.221.141.231.nat.pool.zt.hu [185.221.141.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 68FB2591 for ; Thu, 23 Oct 2025 16:57:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1761231444; bh=SNpb/UkK5MooaL1bhquKcRlIwiMAGnbUcYlT+TnPVF8=; h=From:To:Subject:Date:From; b=Ae40GowTRHuY7b3ENzvv4snx8pU/nRpb+mNgU4tNmY49abfuC/6oSkj8oCMPyRctp k7ZIj+/zvscCA4KGb30XbNPrysX7kES3Opk2aMvQMD729oQ5md13PoR2T654ZhFTk7 6Sy3v2KTqRBYVlX3ldjBR1/a3qT3h6Xq7ssg1JOM= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1] libcamera: base: {Unique, Shared}FD: Warn if closing fails Date: Thu, 23 Oct 2025 16:59:06 +0200 Message-ID: <20251023145906.1088030-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.51.1.dirty MIME-Version: 1.0 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" If the contained file descriptor cannot be successfully closed, that is usually a sign of a more serious invariant violation, which deserves attention, so report those cases. Signed-off-by: Barnabás Pőcze Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- src/libcamera/base/shared_fd.cpp | 7 +++++-- src/libcamera/base/unique_fd.cpp | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libcamera/base/shared_fd.cpp b/src/libcamera/base/shared_fd.cpp index 7afc8ca59..81b703a89 100644 --- a/src/libcamera/base/shared_fd.cpp +++ b/src/libcamera/base/shared_fd.cpp @@ -284,8 +284,11 @@ SharedFD::Descriptor::Descriptor(int fd, bool duplicate) SharedFD::Descriptor::~Descriptor() { - if (fd_ != -1) - close(fd_); + if (fd_ >= 0 && close(fd_) < 0) { + int ret = -errno; + LOG(SharedFD, Error) << "Failed to close file descriptor " + << fd_ << ": " << strerror(-ret); + } } } /* namespace libcamera */ diff --git a/src/libcamera/base/unique_fd.cpp b/src/libcamera/base/unique_fd.cpp index d0649e4de..178c08c4b 100644 --- a/src/libcamera/base/unique_fd.cpp +++ b/src/libcamera/base/unique_fd.cpp @@ -7,6 +7,7 @@ #include +#include #include #include @@ -98,8 +99,11 @@ void UniqueFD::reset(int fd) std::swap(fd, fd_); - if (fd >= 0) - close(fd); + if (fd >= 0 && close(fd) < 0) { + int ret = -errno; + LOG(UniqueFD, Error) << "Failed to close file descriptor " + << fd << ": " << strerror(-ret); + } } /**