From patchwork Thu Jan 23 12:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11347701 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A65A17EA for ; Thu, 23 Jan 2020 12:57:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7B0D24125 for ; Thu, 23 Jan 2020 12:57:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jCoeFfOp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726204AbgAWM5Z (ORCPT ); Thu, 23 Jan 2020 07:57:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21837 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726026AbgAWM5Z (ORCPT ); Thu, 23 Jan 2020 07:57:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579784243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aJD9KK2G0X/amXefpzPuZ1hfpfBQvveBFoJkaAkQiXg=; b=jCoeFfOpUTZWOo6mZNyiLkk7l6FlbYXVYkC2+/h0bl9B4zyQL+opHBXaE8VXSWZCabjMz4 QvaIa22T0fzYZdg7LvznmAbPsZDhhf1eskeSaBAb0p8rewkiU/SdORQzh69PHSoziezES0 NEihLrTA+Ui8QIDYsz6bISIDDxcahLw= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-PD2mLyWEPyGdqaauvxusJA-1; Thu, 23 Jan 2020 07:57:21 -0500 X-MC-Unique: PD2mLyWEPyGdqaauvxusJA-1 Received: by mail-wm1-f72.google.com with SMTP id o24so525632wmh.0 for ; Thu, 23 Jan 2020 04:57:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aJD9KK2G0X/amXefpzPuZ1hfpfBQvveBFoJkaAkQiXg=; b=Cl4A5hVUZlh5qz1429mNUs40K8mJSz2pUVCqNIMOahdRztwRdjCG2wSkbLG34CPW24 GL3IwxkKwO3lvSKkcnaqAWra2j4E83RKoyYQEMGlQGVkpCVtlHXPwHdUBW1zvvCGn8KD uZ0hZgPRB0cCtKbiCSQP6HPTFK4cCpYafyWQjuI0LNdzcwnSHuXw40xgcxmKBoGF0VDU i3/Y82uw9+EFec59h0NIIg76gzcn+oejVBxfjguBtSxM0iVgkIGNf/ZHzZGAFi9IHtdp wZwpL20s4/EZUk/L0HMfSzrgMbZOyBG8LC9FcnHDK5zCeQw9yOYIbloGdKbXAiKzCYGQ DbKA== X-Gm-Message-State: APjAAAUZ1CUfTz+SpoZW6js10x5/AU0AfmAk+2tnmaRRgk+nwi3oPNtZ YpsD7oFTT2LQldJ6W6BhMEloaT4ZaSxArFXmXUFySpiyYOtKntkRHumRVEmwKC03vra6D9NhGn0 k1qyHrukhu3Onr3HWHw== X-Received: by 2002:a5d:52c4:: with SMTP id r4mr17389393wrv.368.1579784239613; Thu, 23 Jan 2020 04:57:19 -0800 (PST) X-Google-Smtp-Source: APXvYqy/2IfOX/2qghzs8Og4npaNyA9dmYjgrYiGBHtkyh56R/ynkDXysXpXrmXHFbuWjX/uZk/mzA== X-Received: by 2002:a5d:52c4:: with SMTP id r4mr17389363wrv.368.1579784239197; Thu, 23 Jan 2020 04:57:19 -0800 (PST) Received: from omos.redhat.com (ip-46.34.233.121.o2inet.sk. [46.34.233.121]) by smtp.gmail.com with ESMTPSA id d8sm2821028wrx.71.2020.01.23.04.57.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 04:57:18 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace v2 1/4] libsepol: fix CIL_KEY_* build errors with -fno-common Date: Thu, 23 Jan 2020 13:57:13 +0100 Message-Id: <20200123125716.12662-2-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200123125716.12662-1-omosnace@redhat.com> References: <20200123125716.12662-1-omosnace@redhat.com> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org GCC 10 comes with -fno-common enabled by default - fix the CIL_KEY_* global variables to be defined only once in cil.c and declared in the header file correctly with the 'extern' keyword, so that other units including the file don't generate duplicate definitions. Signed-off-by: Ondrej Mosnacek --- libsepol/cil/src/cil.c | 162 ++++++++++++++++ libsepol/cil/src/cil_internal.h | 322 ++++++++++++++++---------------- 2 files changed, 323 insertions(+), 161 deletions(-) diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c index de729cf8..d222ad3a 100644 --- a/libsepol/cil/src/cil.c +++ b/libsepol/cil/src/cil.c @@ -77,6 +77,168 @@ int cil_sym_sizes[CIL_SYM_ARRAY_NUM][CIL_SYM_NUM] = { {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1} }; +char *CIL_KEY_CONS_T1; +char *CIL_KEY_CONS_T2; +char *CIL_KEY_CONS_T3; +char *CIL_KEY_CONS_R1; +char *CIL_KEY_CONS_R2; +char *CIL_KEY_CONS_R3; +char *CIL_KEY_CONS_U1; +char *CIL_KEY_CONS_U2; +char *CIL_KEY_CONS_U3; +char *CIL_KEY_CONS_L1; +char *CIL_KEY_CONS_L2; +char *CIL_KEY_CONS_H1; +char *CIL_KEY_CONS_H2; +char *CIL_KEY_AND; +char *CIL_KEY_OR; +char *CIL_KEY_NOT; +char *CIL_KEY_EQ; +char *CIL_KEY_NEQ; +char *CIL_KEY_CONS_DOM; +char *CIL_KEY_CONS_DOMBY; +char *CIL_KEY_CONS_INCOMP; +char *CIL_KEY_CONDTRUE; +char *CIL_KEY_CONDFALSE; +char *CIL_KEY_SELF; +char *CIL_KEY_OBJECT_R; +char *CIL_KEY_STAR; +char *CIL_KEY_TCP; +char *CIL_KEY_UDP; +char *CIL_KEY_DCCP; +char *CIL_KEY_SCTP; +char *CIL_KEY_AUDITALLOW; +char *CIL_KEY_TUNABLEIF; +char *CIL_KEY_ALLOW; +char *CIL_KEY_DONTAUDIT; +char *CIL_KEY_TYPETRANSITION; +char *CIL_KEY_TYPECHANGE; +char *CIL_KEY_CALL; +char *CIL_KEY_TUNABLE; +char *CIL_KEY_XOR; +char *CIL_KEY_ALL; +char *CIL_KEY_RANGE; +char *CIL_KEY_GLOB; +char *CIL_KEY_FILE; +char *CIL_KEY_DIR; +char *CIL_KEY_CHAR; +char *CIL_KEY_BLOCK; +char *CIL_KEY_SOCKET; +char *CIL_KEY_PIPE; +char *CIL_KEY_SYMLINK; +char *CIL_KEY_ANY; +char *CIL_KEY_XATTR; +char *CIL_KEY_TASK; +char *CIL_KEY_TRANS; +char *CIL_KEY_TYPE; +char *CIL_KEY_ROLE; +char *CIL_KEY_USER; +char *CIL_KEY_USERATTRIBUTE; +char *CIL_KEY_USERATTRIBUTESET; +char *CIL_KEY_SENSITIVITY; +char *CIL_KEY_CATEGORY; +char *CIL_KEY_CATSET; +char *CIL_KEY_LEVEL; +char *CIL_KEY_LEVELRANGE; +char *CIL_KEY_CLASS; +char *CIL_KEY_IPADDR; +char *CIL_KEY_MAP_CLASS; +char *CIL_KEY_CLASSPERMISSION; +char *CIL_KEY_BOOL; +char *CIL_KEY_STRING; +char *CIL_KEY_NAME; +char *CIL_KEY_SOURCE; +char *CIL_KEY_TARGET; +char *CIL_KEY_LOW; +char *CIL_KEY_HIGH; +char *CIL_KEY_LOW_HIGH; +char *CIL_KEY_GLBLUB; +char *CIL_KEY_HANDLEUNKNOWN; +char *CIL_KEY_HANDLEUNKNOWN_ALLOW; +char *CIL_KEY_HANDLEUNKNOWN_DENY; +char *CIL_KEY_HANDLEUNKNOWN_REJECT; +char *CIL_KEY_MACRO; +char *CIL_KEY_IN; +char *CIL_KEY_MLS; +char *CIL_KEY_DEFAULTRANGE; +char *CIL_KEY_BLOCKINHERIT; +char *CIL_KEY_BLOCKABSTRACT; +char *CIL_KEY_CLASSORDER; +char *CIL_KEY_CLASSMAPPING; +char *CIL_KEY_CLASSPERMISSIONSET; +char *CIL_KEY_COMMON; +char *CIL_KEY_CLASSCOMMON; +char *CIL_KEY_SID; +char *CIL_KEY_SIDCONTEXT; +char *CIL_KEY_SIDORDER; +char *CIL_KEY_USERLEVEL; +char *CIL_KEY_USERRANGE; +char *CIL_KEY_USERBOUNDS; +char *CIL_KEY_USERPREFIX; +char *CIL_KEY_SELINUXUSER; +char *CIL_KEY_SELINUXUSERDEFAULT; +char *CIL_KEY_TYPEATTRIBUTE; +char *CIL_KEY_TYPEATTRIBUTESET; +char *CIL_KEY_EXPANDTYPEATTRIBUTE; +char *CIL_KEY_TYPEALIAS; +char *CIL_KEY_TYPEALIASACTUAL; +char *CIL_KEY_TYPEBOUNDS; +char *CIL_KEY_TYPEPERMISSIVE; +char *CIL_KEY_RANGETRANSITION; +char *CIL_KEY_USERROLE; +char *CIL_KEY_ROLETYPE; +char *CIL_KEY_ROLETRANSITION; +char *CIL_KEY_ROLEALLOW; +char *CIL_KEY_ROLEATTRIBUTE; +char *CIL_KEY_ROLEATTRIBUTESET; +char *CIL_KEY_ROLEBOUNDS; +char *CIL_KEY_BOOLEANIF; +char *CIL_KEY_NEVERALLOW; +char *CIL_KEY_TYPEMEMBER; +char *CIL_KEY_SENSALIAS; +char *CIL_KEY_SENSALIASACTUAL; +char *CIL_KEY_CATALIAS; +char *CIL_KEY_CATALIASACTUAL; +char *CIL_KEY_CATORDER; +char *CIL_KEY_SENSITIVITYORDER; +char *CIL_KEY_SENSCAT; +char *CIL_KEY_CONSTRAIN; +char *CIL_KEY_MLSCONSTRAIN; +char *CIL_KEY_VALIDATETRANS; +char *CIL_KEY_MLSVALIDATETRANS; +char *CIL_KEY_CONTEXT; +char *CIL_KEY_FILECON; +char *CIL_KEY_IBPKEYCON; +char *CIL_KEY_IBENDPORTCON; +char *CIL_KEY_PORTCON; +char *CIL_KEY_NODECON; +char *CIL_KEY_GENFSCON; +char *CIL_KEY_NETIFCON; +char *CIL_KEY_PIRQCON; +char *CIL_KEY_IOMEMCON; +char *CIL_KEY_IOPORTCON; +char *CIL_KEY_PCIDEVICECON; +char *CIL_KEY_DEVICETREECON; +char *CIL_KEY_FSUSE; +char *CIL_KEY_POLICYCAP; +char *CIL_KEY_OPTIONAL; +char *CIL_KEY_DEFAULTUSER; +char *CIL_KEY_DEFAULTROLE; +char *CIL_KEY_DEFAULTTYPE; +char *CIL_KEY_ROOT; +char *CIL_KEY_NODE; +char *CIL_KEY_PERM; +char *CIL_KEY_ALLOWX; +char *CIL_KEY_AUDITALLOWX; +char *CIL_KEY_DONTAUDITX; +char *CIL_KEY_NEVERALLOWX; +char *CIL_KEY_PERMISSIONX; +char *CIL_KEY_IOCTL; +char *CIL_KEY_UNORDERED; +char *CIL_KEY_SRC_INFO; +char *CIL_KEY_SRC_CIL; +char *CIL_KEY_SRC_HLL; + static void cil_init_keys(void) { /* Initialize CIL Keys into strpool */ diff --git a/libsepol/cil/src/cil_internal.h b/libsepol/cil/src/cil_internal.h index 30fab649..9bdcbdd0 100644 --- a/libsepol/cil/src/cil_internal.h +++ b/libsepol/cil/src/cil_internal.h @@ -74,167 +74,167 @@ enum cil_pass { /* Keywords */ -char *CIL_KEY_CONS_T1; -char *CIL_KEY_CONS_T2; -char *CIL_KEY_CONS_T3; -char *CIL_KEY_CONS_R1; -char *CIL_KEY_CONS_R2; -char *CIL_KEY_CONS_R3; -char *CIL_KEY_CONS_U1; -char *CIL_KEY_CONS_U2; -char *CIL_KEY_CONS_U3; -char *CIL_KEY_CONS_L1; -char *CIL_KEY_CONS_L2; -char *CIL_KEY_CONS_H1; -char *CIL_KEY_CONS_H2; -char *CIL_KEY_AND; -char *CIL_KEY_OR; -char *CIL_KEY_NOT; -char *CIL_KEY_EQ; -char *CIL_KEY_NEQ; -char *CIL_KEY_CONS_DOM; -char *CIL_KEY_CONS_DOMBY; -char *CIL_KEY_CONS_INCOMP; -char *CIL_KEY_CONDTRUE; -char *CIL_KEY_CONDFALSE; -char *CIL_KEY_SELF; -char *CIL_KEY_OBJECT_R; -char *CIL_KEY_STAR; -char *CIL_KEY_TCP; -char *CIL_KEY_UDP; -char *CIL_KEY_DCCP; -char *CIL_KEY_SCTP; -char *CIL_KEY_AUDITALLOW; -char *CIL_KEY_TUNABLEIF; -char *CIL_KEY_ALLOW; -char *CIL_KEY_DONTAUDIT; -char *CIL_KEY_TYPETRANSITION; -char *CIL_KEY_TYPECHANGE; -char *CIL_KEY_CALL; -char *CIL_KEY_TUNABLE; -char *CIL_KEY_XOR; -char *CIL_KEY_ALL; -char *CIL_KEY_RANGE; -char *CIL_KEY_GLOB; -char *CIL_KEY_FILE; -char *CIL_KEY_DIR; -char *CIL_KEY_CHAR; -char *CIL_KEY_BLOCK; -char *CIL_KEY_SOCKET; -char *CIL_KEY_PIPE; -char *CIL_KEY_SYMLINK; -char *CIL_KEY_ANY; -char *CIL_KEY_XATTR; -char *CIL_KEY_TASK; -char *CIL_KEY_TRANS; -char *CIL_KEY_TYPE; -char *CIL_KEY_ROLE; -char *CIL_KEY_USER; -char *CIL_KEY_USERATTRIBUTE; -char *CIL_KEY_USERATTRIBUTESET; -char *CIL_KEY_SENSITIVITY; -char *CIL_KEY_CATEGORY; -char *CIL_KEY_CATSET; -char *CIL_KEY_LEVEL; -char *CIL_KEY_LEVELRANGE; -char *CIL_KEY_CLASS; -char *CIL_KEY_IPADDR; -char *CIL_KEY_MAP_CLASS; -char *CIL_KEY_CLASSPERMISSION; -char *CIL_KEY_BOOL; -char *CIL_KEY_STRING; -char *CIL_KEY_NAME; -char *CIL_KEY_SOURCE; -char *CIL_KEY_TARGET; -char *CIL_KEY_LOW; -char *CIL_KEY_HIGH; -char *CIL_KEY_LOW_HIGH; -char *CIL_KEY_GLBLUB; -char *CIL_KEY_HANDLEUNKNOWN; -char *CIL_KEY_HANDLEUNKNOWN_ALLOW; -char *CIL_KEY_HANDLEUNKNOWN_DENY; -char *CIL_KEY_HANDLEUNKNOWN_REJECT; -char *CIL_KEY_MACRO; -char *CIL_KEY_IN; -char *CIL_KEY_MLS; -char *CIL_KEY_DEFAULTRANGE; -char *CIL_KEY_BLOCKINHERIT; -char *CIL_KEY_BLOCKABSTRACT; -char *CIL_KEY_CLASSORDER; -char *CIL_KEY_CLASSMAPPING; -char *CIL_KEY_CLASSPERMISSIONSET; -char *CIL_KEY_COMMON; -char *CIL_KEY_CLASSCOMMON; -char *CIL_KEY_SID; -char *CIL_KEY_SIDCONTEXT; -char *CIL_KEY_SIDORDER; -char *CIL_KEY_USERLEVEL; -char *CIL_KEY_USERRANGE; -char *CIL_KEY_USERBOUNDS; -char *CIL_KEY_USERPREFIX; -char *CIL_KEY_SELINUXUSER; -char *CIL_KEY_SELINUXUSERDEFAULT; -char *CIL_KEY_TYPEATTRIBUTE; -char *CIL_KEY_TYPEATTRIBUTESET; -char *CIL_KEY_EXPANDTYPEATTRIBUTE; -char *CIL_KEY_TYPEALIAS; -char *CIL_KEY_TYPEALIASACTUAL; -char *CIL_KEY_TYPEBOUNDS; -char *CIL_KEY_TYPEPERMISSIVE; -char *CIL_KEY_RANGETRANSITION; -char *CIL_KEY_USERROLE; -char *CIL_KEY_ROLETYPE; -char *CIL_KEY_ROLETRANSITION; -char *CIL_KEY_ROLEALLOW; -char *CIL_KEY_ROLEATTRIBUTE; -char *CIL_KEY_ROLEATTRIBUTESET; -char *CIL_KEY_ROLEBOUNDS; -char *CIL_KEY_BOOLEANIF; -char *CIL_KEY_NEVERALLOW; -char *CIL_KEY_TYPEMEMBER; -char *CIL_KEY_SENSALIAS; -char *CIL_KEY_SENSALIASACTUAL; -char *CIL_KEY_CATALIAS; -char *CIL_KEY_CATALIASACTUAL; -char *CIL_KEY_CATORDER; -char *CIL_KEY_SENSITIVITYORDER; -char *CIL_KEY_SENSCAT; -char *CIL_KEY_CONSTRAIN; -char *CIL_KEY_MLSCONSTRAIN; -char *CIL_KEY_VALIDATETRANS; -char *CIL_KEY_MLSVALIDATETRANS; -char *CIL_KEY_CONTEXT; -char *CIL_KEY_FILECON; -char *CIL_KEY_IBPKEYCON; -char *CIL_KEY_IBENDPORTCON; -char *CIL_KEY_PORTCON; -char *CIL_KEY_NODECON; -char *CIL_KEY_GENFSCON; -char *CIL_KEY_NETIFCON; -char *CIL_KEY_PIRQCON; -char *CIL_KEY_IOMEMCON; -char *CIL_KEY_IOPORTCON; -char *CIL_KEY_PCIDEVICECON; -char *CIL_KEY_DEVICETREECON; -char *CIL_KEY_FSUSE; -char *CIL_KEY_POLICYCAP; -char *CIL_KEY_OPTIONAL; -char *CIL_KEY_DEFAULTUSER; -char *CIL_KEY_DEFAULTROLE; -char *CIL_KEY_DEFAULTTYPE; -char *CIL_KEY_ROOT; -char *CIL_KEY_NODE; -char *CIL_KEY_PERM; -char *CIL_KEY_ALLOWX; -char *CIL_KEY_AUDITALLOWX; -char *CIL_KEY_DONTAUDITX; -char *CIL_KEY_NEVERALLOWX; -char *CIL_KEY_PERMISSIONX; -char *CIL_KEY_IOCTL; -char *CIL_KEY_UNORDERED; -char *CIL_KEY_SRC_INFO; -char *CIL_KEY_SRC_CIL; -char *CIL_KEY_SRC_HLL; +extern char *CIL_KEY_CONS_T1; +extern char *CIL_KEY_CONS_T2; +extern char *CIL_KEY_CONS_T3; +extern char *CIL_KEY_CONS_R1; +extern char *CIL_KEY_CONS_R2; +extern char *CIL_KEY_CONS_R3; +extern char *CIL_KEY_CONS_U1; +extern char *CIL_KEY_CONS_U2; +extern char *CIL_KEY_CONS_U3; +extern char *CIL_KEY_CONS_L1; +extern char *CIL_KEY_CONS_L2; +extern char *CIL_KEY_CONS_H1; +extern char *CIL_KEY_CONS_H2; +extern char *CIL_KEY_AND; +extern char *CIL_KEY_OR; +extern char *CIL_KEY_NOT; +extern char *CIL_KEY_EQ; +extern char *CIL_KEY_NEQ; +extern char *CIL_KEY_CONS_DOM; +extern char *CIL_KEY_CONS_DOMBY; +extern char *CIL_KEY_CONS_INCOMP; +extern char *CIL_KEY_CONDTRUE; +extern char *CIL_KEY_CONDFALSE; +extern char *CIL_KEY_SELF; +extern char *CIL_KEY_OBJECT_R; +extern char *CIL_KEY_STAR; +extern char *CIL_KEY_TCP; +extern char *CIL_KEY_UDP; +extern char *CIL_KEY_DCCP; +extern char *CIL_KEY_SCTP; +extern char *CIL_KEY_AUDITALLOW; +extern char *CIL_KEY_TUNABLEIF; +extern char *CIL_KEY_ALLOW; +extern char *CIL_KEY_DONTAUDIT; +extern char *CIL_KEY_TYPETRANSITION; +extern char *CIL_KEY_TYPECHANGE; +extern char *CIL_KEY_CALL; +extern char *CIL_KEY_TUNABLE; +extern char *CIL_KEY_XOR; +extern char *CIL_KEY_ALL; +extern char *CIL_KEY_RANGE; +extern char *CIL_KEY_GLOB; +extern char *CIL_KEY_FILE; +extern char *CIL_KEY_DIR; +extern char *CIL_KEY_CHAR; +extern char *CIL_KEY_BLOCK; +extern char *CIL_KEY_SOCKET; +extern char *CIL_KEY_PIPE; +extern char *CIL_KEY_SYMLINK; +extern char *CIL_KEY_ANY; +extern char *CIL_KEY_XATTR; +extern char *CIL_KEY_TASK; +extern char *CIL_KEY_TRANS; +extern char *CIL_KEY_TYPE; +extern char *CIL_KEY_ROLE; +extern char *CIL_KEY_USER; +extern char *CIL_KEY_USERATTRIBUTE; +extern char *CIL_KEY_USERATTRIBUTESET; +extern char *CIL_KEY_SENSITIVITY; +extern char *CIL_KEY_CATEGORY; +extern char *CIL_KEY_CATSET; +extern char *CIL_KEY_LEVEL; +extern char *CIL_KEY_LEVELRANGE; +extern char *CIL_KEY_CLASS; +extern char *CIL_KEY_IPADDR; +extern char *CIL_KEY_MAP_CLASS; +extern char *CIL_KEY_CLASSPERMISSION; +extern char *CIL_KEY_BOOL; +extern char *CIL_KEY_STRING; +extern char *CIL_KEY_NAME; +extern char *CIL_KEY_SOURCE; +extern char *CIL_KEY_TARGET; +extern char *CIL_KEY_LOW; +extern char *CIL_KEY_HIGH; +extern char *CIL_KEY_LOW_HIGH; +extern char *CIL_KEY_GLBLUB; +extern char *CIL_KEY_HANDLEUNKNOWN; +extern char *CIL_KEY_HANDLEUNKNOWN_ALLOW; +extern char *CIL_KEY_HANDLEUNKNOWN_DENY; +extern char *CIL_KEY_HANDLEUNKNOWN_REJECT; +extern char *CIL_KEY_MACRO; +extern char *CIL_KEY_IN; +extern char *CIL_KEY_MLS; +extern char *CIL_KEY_DEFAULTRANGE; +extern char *CIL_KEY_BLOCKINHERIT; +extern char *CIL_KEY_BLOCKABSTRACT; +extern char *CIL_KEY_CLASSORDER; +extern char *CIL_KEY_CLASSMAPPING; +extern char *CIL_KEY_CLASSPERMISSIONSET; +extern char *CIL_KEY_COMMON; +extern char *CIL_KEY_CLASSCOMMON; +extern char *CIL_KEY_SID; +extern char *CIL_KEY_SIDCONTEXT; +extern char *CIL_KEY_SIDORDER; +extern char *CIL_KEY_USERLEVEL; +extern char *CIL_KEY_USERRANGE; +extern char *CIL_KEY_USERBOUNDS; +extern char *CIL_KEY_USERPREFIX; +extern char *CIL_KEY_SELINUXUSER; +extern char *CIL_KEY_SELINUXUSERDEFAULT; +extern char *CIL_KEY_TYPEATTRIBUTE; +extern char *CIL_KEY_TYPEATTRIBUTESET; +extern char *CIL_KEY_EXPANDTYPEATTRIBUTE; +extern char *CIL_KEY_TYPEALIAS; +extern char *CIL_KEY_TYPEALIASACTUAL; +extern char *CIL_KEY_TYPEBOUNDS; +extern char *CIL_KEY_TYPEPERMISSIVE; +extern char *CIL_KEY_RANGETRANSITION; +extern char *CIL_KEY_USERROLE; +extern char *CIL_KEY_ROLETYPE; +extern char *CIL_KEY_ROLETRANSITION; +extern char *CIL_KEY_ROLEALLOW; +extern char *CIL_KEY_ROLEATTRIBUTE; +extern char *CIL_KEY_ROLEATTRIBUTESET; +extern char *CIL_KEY_ROLEBOUNDS; +extern char *CIL_KEY_BOOLEANIF; +extern char *CIL_KEY_NEVERALLOW; +extern char *CIL_KEY_TYPEMEMBER; +extern char *CIL_KEY_SENSALIAS; +extern char *CIL_KEY_SENSALIASACTUAL; +extern char *CIL_KEY_CATALIAS; +extern char *CIL_KEY_CATALIASACTUAL; +extern char *CIL_KEY_CATORDER; +extern char *CIL_KEY_SENSITIVITYORDER; +extern char *CIL_KEY_SENSCAT; +extern char *CIL_KEY_CONSTRAIN; +extern char *CIL_KEY_MLSCONSTRAIN; +extern char *CIL_KEY_VALIDATETRANS; +extern char *CIL_KEY_MLSVALIDATETRANS; +extern char *CIL_KEY_CONTEXT; +extern char *CIL_KEY_FILECON; +extern char *CIL_KEY_IBPKEYCON; +extern char *CIL_KEY_IBENDPORTCON; +extern char *CIL_KEY_PORTCON; +extern char *CIL_KEY_NODECON; +extern char *CIL_KEY_GENFSCON; +extern char *CIL_KEY_NETIFCON; +extern char *CIL_KEY_PIRQCON; +extern char *CIL_KEY_IOMEMCON; +extern char *CIL_KEY_IOPORTCON; +extern char *CIL_KEY_PCIDEVICECON; +extern char *CIL_KEY_DEVICETREECON; +extern char *CIL_KEY_FSUSE; +extern char *CIL_KEY_POLICYCAP; +extern char *CIL_KEY_OPTIONAL; +extern char *CIL_KEY_DEFAULTUSER; +extern char *CIL_KEY_DEFAULTROLE; +extern char *CIL_KEY_DEFAULTTYPE; +extern char *CIL_KEY_ROOT; +extern char *CIL_KEY_NODE; +extern char *CIL_KEY_PERM; +extern char *CIL_KEY_ALLOWX; +extern char *CIL_KEY_AUDITALLOWX; +extern char *CIL_KEY_DONTAUDITX; +extern char *CIL_KEY_NEVERALLOWX; +extern char *CIL_KEY_PERMISSIONX; +extern char *CIL_KEY_IOCTL; +extern char *CIL_KEY_UNORDERED; +extern char *CIL_KEY_SRC_INFO; +extern char *CIL_KEY_SRC_CIL; +extern char *CIL_KEY_SRC_HLL; /* Symbol Table Array Indices From patchwork Thu Jan 23 12:57:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11347705 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1DB317EA for ; Thu, 23 Jan 2020 12:57:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD09F24673 for ; Thu, 23 Jan 2020 12:57:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UBku0h76" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726232AbgAWM51 (ORCPT ); Thu, 23 Jan 2020 07:57:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60589 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726170AbgAWM51 (ORCPT ); Thu, 23 Jan 2020 07:57:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579784246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zJqVOqKDzdK8RLPmvzXdNuUPuXVrwd2ey9Kx5GAqz34=; b=UBku0h76CEaSUU9UoqiDSXbTeH4mNtwbuRM+/nkiwFMcbWHBIAvb440UFxoY8XKwaRGj3R BrfNyfVFRODc1Ml26M0LfujddsAg2vtXUHfZaKOoENcI8Fh3RN1E7ICH56hvrZnYe4FsSw bnqKoB2nzWlDMoiogNPJco+LB3VHhS8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-B95MO0ICN9q7iOIjrFwbLg-1; Thu, 23 Jan 2020 07:57:21 -0500 X-MC-Unique: B95MO0ICN9q7iOIjrFwbLg-1 Received: by mail-wm1-f70.google.com with SMTP id b202so444484wmb.2 for ; Thu, 23 Jan 2020 04:57:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zJqVOqKDzdK8RLPmvzXdNuUPuXVrwd2ey9Kx5GAqz34=; b=fD96gqrNdy0PGPzoehCKrTh2hS3GgldjIDSdJ5Gt+YT5Qkbw19yZ+M0/oBJu5QTdlE BGIXIbKGXuz5LW8qKLCKyIcAWsdFmAfkqgft9fBS3/VLnAVXk5oR1rjMq4Edz1KME/L+ rPdu7AVS6vaFlUA3g7a6aQ3m78nntuBP3jx41qcdOzcHTwffGx2jThCyN+Vvhwhym5KB AT5EwRUztGYMwcSb8mrYveW/mP90hQ7xiY9lnIHCMknzriEE+9vIkeu2bZnci5F3rWCZ 79bY6LmdzzC4C32c40v1vRGT7GgQjrTgfIMZHwlPODZEKTMHmw/J428dDLyk4EawHkcM cBEA== X-Gm-Message-State: APjAAAWVsGZmluMxdeaVILaapgMsHKxAPm1QfjRtUxeCqhUBN1mZIvBg ksRlbetzsXsaZ/OlPiYa7S3AtdkN0hY3cNmiseZYkm/cAlzYA8hoZHD6iNU9Kst2u2t5EhWVGNY 1c4xF43QQdIIzL+vghw== X-Received: by 2002:a5d:6b82:: with SMTP id n2mr18741917wrx.153.1579784240410; Thu, 23 Jan 2020 04:57:20 -0800 (PST) X-Google-Smtp-Source: APXvYqzUTQcVTWACh0B2CxImDMNMV7fLUpPsMvBk4RHzwzyiZ+ZexfCVKXput9N6CIkXyNjjE97u9g== X-Received: by 2002:a5d:6b82:: with SMTP id n2mr18741896wrx.153.1579784240174; Thu, 23 Jan 2020 04:57:20 -0800 (PST) Received: from omos.redhat.com (ip-46.34.233.121.o2inet.sk. [46.34.233.121]) by smtp.gmail.com with ESMTPSA id d8sm2821028wrx.71.2020.01.23.04.57.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 04:57:19 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace v2 2/4] libsepol: remove leftovers of cil_mem_error_handler Date: Thu, 23 Jan 2020 13:57:14 +0100 Message-Id: <20200123125716.12662-3-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200123125716.12662-1-omosnace@redhat.com> References: <20200123125716.12662-1-omosnace@redhat.com> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Commit 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function pointer") replaced cil_mem_error_handler usage with inline contents of the default handler. However, it left over the header declaration and two callers. Convert these as well and remove the header declaration. This also fixes a build failure with -fno-common. Fixes: 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function pointer") Signed-off-by: Ondrej Mosnacek --- libsepol/cil/src/cil_mem.h | 1 - libsepol/cil/src/cil_strpool.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libsepol/cil/src/cil_mem.h b/libsepol/cil/src/cil_mem.h index 902ce131..794f02a3 100644 --- a/libsepol/cil/src/cil_mem.h +++ b/libsepol/cil/src/cil_mem.h @@ -36,7 +36,6 @@ void *cil_calloc(size_t num_elements, size_t element_size); void *cil_realloc(void *ptr, size_t size); char *cil_strdup(const char *str); int cil_asprintf(char **strp, const char *fmt, ...); -void (*cil_mem_error_handler)(void); #endif /* CIL_MEM_H_ */ diff --git a/libsepol/cil/src/cil_strpool.c b/libsepol/cil/src/cil_strpool.c index 97d4c4b9..2598bbf3 100644 --- a/libsepol/cil/src/cil_strpool.c +++ b/libsepol/cil/src/cil_strpool.c @@ -80,8 +80,8 @@ char *cil_strpool_add(const char *str) int rc = hashtab_insert(cil_strpool_tab, (hashtab_key_t)strpool_ref->str, strpool_ref); if (rc != SEPOL_OK) { pthread_mutex_unlock(&cil_strpool_mutex); - (*cil_mem_error_handler)(); - pthread_mutex_lock(&cil_strpool_mutex); + cil_log(CIL_ERR, "Failed to allocate memory\n"); + exit(1); } } @@ -104,8 +104,8 @@ void cil_strpool_init(void) cil_strpool_tab = hashtab_create(cil_strpool_hash, cil_strpool_compare, CIL_STRPOOL_TABLE_SIZE); if (cil_strpool_tab == NULL) { pthread_mutex_unlock(&cil_strpool_mutex); - (*cil_mem_error_handler)(); - return; + cil_log(CIL_ERR, "Failed to allocate memory\n"); + exit(1); } } cil_strpool_readers++; From patchwork Thu Jan 23 12:57:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11347703 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A89D2184C for ; Thu, 23 Jan 2020 12:57:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 864DA24673 for ; Thu, 23 Jan 2020 12:57:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PVQhKoVb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726026AbgAWM50 (ORCPT ); Thu, 23 Jan 2020 07:57:26 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29337 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726170AbgAWM50 (ORCPT ); Thu, 23 Jan 2020 07:57:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579784245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h8ZaCM7bdq/CkFeMDtbL8WdIlXEbdg+xTYAfqBBIVoU=; b=PVQhKoVbQZKwBP5A74BJRbFo+pYAf8uHPeNo+YKVfiLzsGXylHPUN4SM91e30/Ha+3LFML 0cjvQIQ/LIpNbwXjJZVTPFK+3kbrkuwE7yjqzVyEN6t1HmlwrlIUib7Zh4PZypQiTGl4qd kAdfRXImIs6nKW+krhsWErUmcr4Cf1U= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-22-UnIzFFb-O0O0RAEjvZaQzA-1; Thu, 23 Jan 2020 07:57:23 -0500 X-MC-Unique: UnIzFFb-O0O0RAEjvZaQzA-1 Received: by mail-wr1-f69.google.com with SMTP id z10so1628159wrt.21 for ; Thu, 23 Jan 2020 04:57:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h8ZaCM7bdq/CkFeMDtbL8WdIlXEbdg+xTYAfqBBIVoU=; b=ffa1hIpMuU1YrT2iS6vJGA8wK3xEMoJmsqMvMi5E4Kk58DvUrUuNdgg1DZIJU2OnTb 1oPq3E33rj7SjZ+0t6hfYGzQVF7YJr0HZ+5deHkc8TrMPZKjV7tXkdu0uINS5CI7rKBa e+6kFULPTSytK4cam+mjQSyvGZTa1VtFUkdF90ry+Hu5CVtV16JIjF3KyWO8AQjcZphV tSQT2o+SS9W4pF/ys7hG5prJWoikP+XfFwvaNEyaE/6pm0Kii+cA5udAhU/qVsfIz7Vd f8VYGASrPN/vvkxeWBumJFzgdoIzzyZOIEthN6583xqvahkxO6fRSnppJN1vBIX0vifZ WIJg== X-Gm-Message-State: APjAAAUjlv9qCTHZU0+Wl2dEOJRzZ0SQbjpkJBPTKZRP899DEgKO1Rf4 k1XcLuvY1/ZVz7xNkYS5IV8nnycrjze/L4DCkuKCSmGg4e8ccjOPCu/cW3zkmZDJMsQlJ81TH8V 9gR9Y06Wro/PBh3Sakg== X-Received: by 2002:adf:e609:: with SMTP id p9mr17261673wrm.397.1579784241529; Thu, 23 Jan 2020 04:57:21 -0800 (PST) X-Google-Smtp-Source: APXvYqxc2CZkQZNUmMKvKbtOiWJGkDku8vdv8V5zyWLL/DCfXo/4M3EZijVorJe0zqywgUVRq7G5qQ== X-Received: by 2002:adf:e609:: with SMTP id p9mr17261652wrm.397.1579784241271; Thu, 23 Jan 2020 04:57:21 -0800 (PST) Received: from omos.redhat.com (ip-46.34.233.121.o2inet.sk. [46.34.233.121]) by smtp.gmail.com with ESMTPSA id d8sm2821028wrx.71.2020.01.23.04.57.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 04:57:20 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace v2 3/4] checkpolicy: remove unused te_assertions Date: Thu, 23 Jan 2020 13:57:15 +0100 Message-Id: <20200123125716.12662-4-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200123125716.12662-1-omosnace@redhat.com> References: <20200123125716.12662-1-omosnace@redhat.com> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org This variable is declared in a header file, but never defined or used. The te_assert structure definition is only used in this declaration, so remove both. Signed-off-by: Ondrej Mosnacek --- checkpolicy/checkpolicy.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/checkpolicy/checkpolicy.h b/checkpolicy/checkpolicy.h index 3868f1fa..f127687e 100644 --- a/checkpolicy/checkpolicy.h +++ b/checkpolicy/checkpolicy.h @@ -1,20 +1,6 @@ #ifndef _CHECKPOLICY_H_ #define _CHECKPOLICY_H_ -#include - -typedef struct te_assert { - ebitmap_t stypes; - ebitmap_t ttypes; - ebitmap_t tclasses; - int self; - sepol_access_vector_t *avp; - unsigned long line; - struct te_assert *next; -} te_assert_t; - -te_assert_t *te_assertions; - extern unsigned int policyvers; #endif From patchwork Thu Jan 23 12:57:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11347707 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38F39184C for ; Thu, 23 Jan 2020 12:57:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16AD124125 for ; Thu, 23 Jan 2020 12:57:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IYPdka9J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726170AbgAWM51 (ORCPT ); Thu, 23 Jan 2020 07:57:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36940 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726227AbgAWM51 (ORCPT ); Thu, 23 Jan 2020 07:57:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579784246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AEQROmI1rYNcfex/ub9JvmWDAcn867q7P2H/yW8vP8U=; b=IYPdka9JTgVxev2a29k2aL5Qdytp4vALKK1fcHw92RTVH5R/cqkPCImaOKBuFP7wEolgha 9a1JBVcGAXWUKtI3H6VeQ1fb/D9wvA6lPZJqhFmtwOZnSiZkBsm0tNZ+z4huVNZ8D3AMov QOAsWh+aWnjRk5T07ebuNYrnaxlrF1Q= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-LZ58JgZ6NSGK91CuSLlFwQ-1; Thu, 23 Jan 2020 07:57:24 -0500 X-MC-Unique: LZ58JgZ6NSGK91CuSLlFwQ-1 Received: by mail-wr1-f71.google.com with SMTP id t3so1613901wrm.23 for ; Thu, 23 Jan 2020 04:57:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AEQROmI1rYNcfex/ub9JvmWDAcn867q7P2H/yW8vP8U=; b=Xxza8CJJPSi6ksT8NXMKcJIUtsLxG/bdAZZmi4Vtg3h4/EvHq7R+FwWw7htodYMV5o SvCKMc7NYSXuHoK1P+taaHreXFI3I73VuLSFF5nfaytOP8rUGyDs1ph+0eveI4164ZPp FEVEzTeZjStS+1t7JkSQnw4QbvAcGRiXPD36vmdDqL2z53HwqCZumCFBvhCXiTkfnkNf IsWp4RwjRFmuEL/tWSF7wW4u4PyZu4A0563Ce89KmO2KxOLwC/0++RzIa6TxU5SJLx1w +y/oNaoSdxutAbgBSQdT/CIDOcWbAHpmeWvk5vNDPrPWUB6mHYvFiWEWilxMqACqQHMu um7Q== X-Gm-Message-State: APjAAAXPVwVi/BM/i9e1OwWPsx9fuMV6iCqLQt8bzhUhUWHhGGnFz6Jg 79sVYJU5gm0cMC26CzdiTl41gzpJDSDHCgq5X/fzrBMYtZsJD+4MYiUV0ITIvdZ0nVVcCS6ZZJX YgbDQa27+vp7mNAdw4Q== X-Received: by 2002:a7b:c1d8:: with SMTP id a24mr4116979wmj.130.1579784243211; Thu, 23 Jan 2020 04:57:23 -0800 (PST) X-Google-Smtp-Source: APXvYqyVYtds6UetVTLFLMBOFGPQN1nJuD1UhwW6rzH5KQcdYxJ2HsTl20JBaUYOjmgyfsukEVY5Pw== X-Received: by 2002:a7b:c1d8:: with SMTP id a24mr4116957wmj.130.1579784242952; Thu, 23 Jan 2020 04:57:22 -0800 (PST) Received: from omos.redhat.com (ip-46.34.233.121.o2inet.sk. [46.34.233.121]) by smtp.gmail.com with ESMTPSA id d8sm2821028wrx.71.2020.01.23.04.57.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 04:57:22 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace v2 4/4] Makefile: always build with -fno-common Date: Thu, 23 Jan 2020 13:57:16 +0100 Message-Id: <20200123125716.12662-5-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200123125716.12662-1-omosnace@redhat.com> References: <20200123125716.12662-1-omosnace@redhat.com> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org GCC 10 has it enabled by default and everything now builds OK with it, so add it to CFLAGS to avoid breaking the build in the future. Signed-off-by: Ondrej Mosnacek Acked-by: James Carter --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c238dbc8..298cd2b7 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,8 @@ else -Wstrict-prototypes \ -Wundef \ -Wunused \ - -Wwrite-strings + -Wwrite-strings \ + -fno-common endif ifneq ($(DESTDIR),)