From patchwork Fri Apr 26 08:42:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1103 Return-Path: Received: from mail.micronovasrl.com (mail.micronovasrl.com [212.103.203.10]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5200F60E9C for ; Fri, 26 Apr 2019 10:42:23 +0200 (CEST) Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id 1B61BB0156E for ; Fri, 26 Apr 2019 10:42:23 +0200 (CEST) Authentication-Results: mail.micronovasrl.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=micronovasrl.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=micronovasrl.com; h=references:in-reply-to:x-mailer:message-id:date:date:subject :subject:to:from:from; s=dkim; t=1556268142; x=1557132143; bh=BN Z+RGuL8UmR8tGaVB57NvfgFu83L3c3JMzEZksaHSc=; b=WtoEpLcm7gLOSjfXlN jo6keVrGhb5JlRK4TCpPhiaPKqApVs8h7r2amuT0nzZdoOIambYRDTfju8Bd/ib7 7qMt3imfbwS6tDGnlX8e/CIOfq8MrqFiZ4hzXrCAPCgCyamh5rVFDY0uCbGakX9D IPKUsBmcqDTw3xarhLwhfbcmQ= X-Virus-Scanned: Debian amavisd-new at mail.micronovasrl.com X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=unavailable autolearn_force=no Received: from mail.micronovasrl.com ([127.0.0.1]) by mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zfnrsyKLuJ0f for ; Fri, 26 Apr 2019 10:42:22 +0200 (CEST) Received: from ubuntu.localdomain (88-149-228-83.v4.ngi.it [88.149.228.83]) by mail.micronovasrl.com (Postfix) with ESMTPSA id 85D4EB01544; Fri, 26 Apr 2019 10:42:21 +0200 (CEST) From: Giulio Benetti To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Apr 2019 10:42:19 +0200 Message-Id: <20190426084220.71500-2-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190426084220.71500-1-giulio.benetti@micronovasrl.com> References: <20190424110044.12608-1-giulio.benetti@micronovasrl.com> <20190426084220.71500-1-giulio.benetti@micronovasrl.com> Subject: [libcamera-devel] [PATCH v2 1/2] meson: check if secure_getenv() is present 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: Fri, 26 Apr 2019 08:42:23 -0000 Not all libc make secure_getenv() available, this could lead to build failure on certain build systems. Check if secure_getenv() and emit #define HAVE_SECURE_GETENV to config.h Include config.h to every c/c++ file during building by adding `-include config.h` to project arguments for both c and c++. Signed-off-by: Giulio Benetti Reviewed-by: Laurent Pinchart --- Changes: V1->V2: use common_arguments to -include config.h and move secure_getenv() check before common_arguments list. meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meson.build b/meson.build index 6e68c3e..9099909 100644 --- a/meson.build +++ b/meson.build @@ -13,8 +13,19 @@ project('libcamera', 'c', 'cpp', # generated from this too. api_version = '0.1' +cc = meson.get_compiler('c') +config_h = configuration_data() + +if cc.has_header_symbol('stdlib.h', 'secure_getenv', prefix: '#define _GNU_SOURCE') + config_h.set('HAVE_SECURE_GETENV', 1) +else + message('C library does not support secure_getenv, using getenv instead') +endif +configure_file(output: 'config.h', configuration: config_h) + common_arguments = [ '-Wno-unused-parameter', + '-include', 'config.h', ] c_arguments = common_arguments From patchwork Fri Apr 26 08:42:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1104 Return-Path: Received: from mail.micronovasrl.com (mail.micronovasrl.com [212.103.203.10]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E220360E9D for ; Fri, 26 Apr 2019 10:42:23 +0200 (CEST) Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id AA65BB0156E for ; Fri, 26 Apr 2019 10:42:23 +0200 (CEST) Authentication-Results: mail.micronovasrl.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=micronovasrl.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=micronovasrl.com; h=references:in-reply-to:x-mailer:message-id:date:date:subject :subject:to:from:from; s=dkim; t=1556268143; x=1557132144; bh=Pz at3zMPETLCUqP7oOOg5jwrvruH2/ZDHmn/vu5/0HA=; b=vIbPducRWMUhNuR98C lXhmAn4IYyEVLJXG7isTcRyQpxZFIhganNIIFZAi+IZVtoMTrbj5daEbQJlRA/1C BVVQdrfvzIWIuQWnyswgSlcRKAlZ7kIXmiXsM+OcJS0P7PIQlXHgENM5+993sfv8 Xoak3ZdPGu2fwfwmsK/DAbgac= X-Virus-Scanned: Debian amavisd-new at mail.micronovasrl.com X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=unavailable autolearn_force=no Received: from mail.micronovasrl.com ([127.0.0.1]) by mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id x-nv-tRXuTlo for ; Fri, 26 Apr 2019 10:42:23 +0200 (CEST) Received: from ubuntu.localdomain (88-149-228-83.v4.ngi.it [88.149.228.83]) by mail.micronovasrl.com (Postfix) with ESMTPSA id BEB29B01557; Fri, 26 Apr 2019 10:42:21 +0200 (CEST) From: Giulio Benetti To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Apr 2019 10:42:20 +0200 Message-Id: <20190426084220.71500-3-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190426084220.71500-1-giulio.benetti@micronovasrl.com> References: <20190424110044.12608-1-giulio.benetti@micronovasrl.com> <20190426084220.71500-1-giulio.benetti@micronovasrl.com> Subject: [libcamera-devel] [PATCH v2 2/2] libcamera: utils: call secure_getenv() if it exists or workaround with issetugid() 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: Fri, 26 Apr 2019 08:42:24 -0000 When secure_getenv() is not available, need to have a workaround. Check if secure_getenv() is present, otherwise call issetugid() on its place. Signed-off-by: Giulio Benetti --- Changes: V1->V2: call ::secure_getenv() instead of secure_getenv() recursively. src/libcamera/utils.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp index 66123b1..5d85b5c 100644 --- a/src/libcamera/utils.cpp +++ b/src/libcamera/utils.cpp @@ -8,7 +8,7 @@ #include "utils.h" #include -#include +#include /** * \file utils.h @@ -57,10 +57,14 @@ const char *basename(const char *path) */ char *secure_getenv(const char *name) { - if (getauxval(AT_SECURE)) +#if HAVE_SECURE_GETENV + return ::secure_getenv(name); +#else + if (issetugid()) return NULL; return getenv(name); +#endif } /**