From patchwork Mon Apr 1 11:03:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 830 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CFCCD600F9 for ; Mon, 1 Apr 2019 13:03:36 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 238522F9; Mon, 1 Apr 2019 13:03:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554116616; bh=ic93TZh7q69lCHqqi0QIAHSQ0J8uhG2yvBq35DmBByI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aCUbwdYYDyjGwC6Zh6Wi9M631J7xXVkizaMDoN9EZ4HwCi9VikHUXx2dTnB4ihlDt FnA0G8u7Tr8wS5w8r+gNQg5dSClHvWYaO3ZFu0uHA3krwMqWqvdB43IkNHt11Z9oSQ 43r243SK/qq7nZdbxj9PzI6tpvYSiGcY1HY1v0YA= From: Kieran Bingham To: LibCamera Devel Date: Mon, 1 Apr 2019 18:03:15 +0700 Message-Id: <20190401110315.4148-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401110315.4148-1-kieran.bingham@ideasonboard.com> References: <20190401110315.4148-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/4] libcamera: utils: Use internal secure_getenv() implementation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2019 11:03:37 -0000 The secure_getenv() call is not provided by all toolchains. Support this feature by implementing our own version. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/include/utils.h | 2 ++ src/libcamera/log.cpp | 4 ++-- src/libcamera/utils.cpp | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h index 1b2a62c0fda7..79038a96feab 100644 --- a/src/libcamera/include/utils.h +++ b/src/libcamera/include/utils.h @@ -24,6 +24,8 @@ std::unique_ptr make_unique(Args&&... args) return std::unique_ptr(new T(std::forward(args)...)); } +char *secure_getenv(const char *name); + } /* namespace utils */ } /* namespace libcamera */ diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index eb444c31857d..71cfbc422ba0 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -122,7 +122,7 @@ Logger::Logger() */ void Logger::parseLogFile() { - const char *file = secure_getenv("LIBCAMERA_LOG_FILE"); + const char *file = utils::secure_getenv("LIBCAMERA_LOG_FILE"); if (!file) return; @@ -140,7 +140,7 @@ void Logger::parseLogFile() */ void Logger::parseLogLevels() { - const char *debug = secure_getenv("LIBCAMERA_LOG_LEVELS"); + const char *debug = utils::secure_getenv("LIBCAMERA_LOG_LEVELS"); if (!debug) return; diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp index 70936e36c5d5..c49e65136514 100644 --- a/src/libcamera/utils.cpp +++ b/src/libcamera/utils.cpp @@ -6,6 +6,7 @@ */ #include +#include #include "utils.h" @@ -35,6 +36,25 @@ const char *basename(const char *path) return base ? base + 1 : path; } +/** + * \brief Get an environment variable + * + * The environment list is searched to find the variable 'name', and returns a + * pointer to the corresponding string. + * If 'secure execution' is required then this function always returns NULL to + * avoid vulnerabilities that could occur if the set-user-ID or set-group-ID + * programs accidentally trusted the environment. + * + * \returns A pointer to the value in the environment or NULL if the match fails + * or a secure environment is required. + */ +char *secure_getenv(const char *name) +{ + if (getauxval(AT_SECURE)) + return NULL; + else + return getenv(name); +} /** * \fn libcamera::utils::make_unique(Args &&... args)