From patchwork Tue Jun 16 10:56:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4043 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 275E660103 for ; Tue, 16 Jun 2020 12:56:52 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="d3odiuhH"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:2807:bdfa:f6a:8e53]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 96956F9; Tue, 16 Jun 2020 12:56:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592305011; bh=B+xZnD39s/MFSH130yxagRP+sRVFl6+vwgXpUMBW8ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d3odiuhHgqb4RRPen4s8uAdr1wsZNsF97zHFbCTDIljRDb3KI46nQRX91ubdsh6Qi cOpEbFs1lXBCpBf2IbqzAtlBj9lTR1uspxcuC1ULpapBiPjwynUf9B5ATrnHWKu8rv Da+vgbBqVL87WBWgkFN5s11SfUJhCKEOo4BqkVhY= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 16 Jun 2020 19:56:33 +0900 Message-Id: <20200616105633.57717-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616105633.57717-1-paul.elder@ideasonboard.com> References: <20200616105633.57717-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] v4l2: v4l2_compat_manager: Use openat64 and mmap64 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: Tue, 16 Jun 2020 10:56:52 -0000 Since we set _FILE_OFFSET_BITS to 32 to force the various open and mmap symbols that we export to not be the 64-bit versions, our dlsym to get the original open and mmap calls will not automatically be converted to their 64-bit versions. Since we intercept both 32-bit and 64-bit versions of open and mmap, we should be using the 64-bit version to service both. Fetch the 64-bit versions of openat and mmap directly. Signed-off-by: Paul Elder --- src/v4l2/v4l2_compat_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index f928760..9298c0f 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -39,11 +39,11 @@ void get_symbol(T &func, const char *name) V4L2CompatManager::V4L2CompatManager() : cm_(nullptr) { - get_symbol(fops_.openat, "openat"); + get_symbol(fops_.openat, "openat64"); get_symbol(fops_.dup, "dup"); get_symbol(fops_.close, "close"); get_symbol(fops_.ioctl, "ioctl"); - get_symbol(fops_.mmap, "mmap"); + get_symbol(fops_.mmap, "mmap64"); get_symbol(fops_.munmap, "munmap"); }