From patchwork Wed Jan 22 15:46:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11345977 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 44646109A for ; Wed, 22 Jan 2020 15:47:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1607A24673 for ; Wed, 22 Jan 2020 15:47:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U37Ga25A" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725933AbgAVPrE (ORCPT ); Wed, 22 Jan 2020 10:47:04 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20398 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725868AbgAVPrE (ORCPT ); Wed, 22 Jan 2020 10:47:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579708022; 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=U37Ga25A3PtkdUG2f8czQhSKnQn8I+kJEG22qiF/c7BNclmhP2Xfj3BPsYuYYrxGgGjQQy 0THNqGoJhW1uSOO0XmsnH7P319RhJErOV59gDe81j+zt9YBGGDo6BbJLpSqLaz46J6Hia2 Riq3AQEpfnVQ5nR1D/SdTbaGrM6/Uio= 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-359-ssXJPFFSNsC9UVKFtXpupg-1; Wed, 22 Jan 2020 10:47:00 -0500 X-MC-Unique: ssXJPFFSNsC9UVKFtXpupg-1 Received: by mail-wm1-f72.google.com with SMTP id g26so1559249wmk.6 for ; Wed, 22 Jan 2020 07:46:59 -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=iFhfsbkQTTfH9t6ZYcI2PaQV3MuDdtfQwDB8klgRVAum92Gg0XORWyRdF4cGhrQET6 zv6fcESe1mGu0taTRBEYqZtMyY7c28gxQGWRaECYa5h/lfHuXd8sB6Egf5vrYl4/BgiL 4/JTU7UljObr5RbVT3gRaDXegdv1rd2jNh+0vqZVv0dOn3x1oUNqBTE9Dc06cGAScKDA 6zTUc8mYMq863iok2SpWYVUq79gVWdCwSihvSJzkPWP0aNBsZRLYyMPapv2evrLaq+31 rtq0s/4aU78iky/mV44qNOf6+iUmO5e7IJhJntpYXPgh6WtUeSvcxr4rur7LOAIqCFEP bUUA== X-Gm-Message-State: APjAAAVupFPhnFrTRYbDCsMF7Gvj7UvesE86SDA0RYT5CGLkS+MSUhIG 0/KE7opYrd+eszT8+97TSsgrhb9QGsj3E29zstcHOOpJF/SNb8+VJMot1UjSO6Vc6mgkqYzmLK5 FNQSFQQBGpPO96gWa6A== X-Received: by 2002:a05:600c:294:: with SMTP id 20mr3542836wmk.97.1579708018829; Wed, 22 Jan 2020 07:46:58 -0800 (PST) X-Google-Smtp-Source: APXvYqz4GwjhWzfyczFeaxNuNpeotLSkGwjWMiRUhzTYAkHw2isp8uN9m57W7mQ3pjqDM64JvSA3jg== X-Received: by 2002:a05:600c:294:: with SMTP id 20mr3542813wmk.97.1579708018512; Wed, 22 Jan 2020 07:46:58 -0800 (PST) Received: from omos.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id c5sm4811788wmb.9.2020.01.22.07.46.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 07:46:58 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace 1/4] libsepol: fix CIL_KEY_* build errors with -fno-common Date: Wed, 22 Jan 2020 16:46:52 +0100 Message-Id: <20200122154655.257233-2-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200122154655.257233-1-omosnace@redhat.com> References: <20200122154655.257233-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 Wed Jan 22 15:46:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11345975 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 0D5AD139A for ; Wed, 22 Jan 2020 15:47:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF97624125 for ; Wed, 22 Jan 2020 15:47:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VoE+pBIq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725911AbgAVPrE (ORCPT ); Wed, 22 Jan 2020 10:47:04 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29496 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725884AbgAVPrE (ORCPT ); Wed, 22 Jan 2020 10:47:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579708023; 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=fdYXrgPZPf1+pERqCah9TmaBcw2cP6a64QeBfDJVZGU=; b=VoE+pBIq+1ANmqOUVNBBvVpObooVTrlDzxRau4XWMPCaEMERgZllpyArPNtfuQZct0HaVP IR4C5ziw7FJHzwStDWRRsvUlukEnsDOMvm+m5ZzTGqlPKh+7z6zzo5kqfFTLePtzDgQI5B gmKtngCehjTGlsNiypN2NUHzjVCi8QI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-JLi_VJd1Px-tIn3SUoriiw-1; Wed, 22 Jan 2020 10:47:00 -0500 X-MC-Unique: JLi_VJd1Px-tIn3SUoriiw-1 Received: by mail-wm1-f71.google.com with SMTP id t17so1557080wmi.7 for ; Wed, 22 Jan 2020 07:47:00 -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=fdYXrgPZPf1+pERqCah9TmaBcw2cP6a64QeBfDJVZGU=; b=N3oSee+bnwimG4VhFg799g11PCiyC+hxonKdRzL4/rzvM3hbnt9ysMSqAD+Q2nv2AD FniwF1BhAFLnR1lMIONh+qJbQoANMNess4qNk38suzY/HXqF5PkhzrwoQAJhJCmFkwYx GCvOJ6O90JnE91ebOszjbTYEKx/2lHQgswmNNm0qVOEjRTyrFWyMIDWYCTRhBdE85eGU I6cllftoyJGIPMJBiWapzWR7d3Unv0vu7v3fU/kLPfYpDgPt/QyWsLrB2uHfnQBDsiHw P2IVVLcYiHLsrfcFQSfNOkksC7zOeFCYacSEpTc20VIwdngbApzLZ4ntk/DxsWy0++3i jcQA== X-Gm-Message-State: APjAAAVzcpsov4BZHxlWNqh+90jytMUQFLWKYpMEypDPbFLH8ZogyHcN M7rl18UG5GYU/hhUFGuRbmY1IC5Xob0+4CkvX3mw92t+shTQeidsQY7eeaRebsBEp11hCwVjCc9 +OMjlFglU00ACbYhGYg== X-Received: by 2002:adf:e5ce:: with SMTP id a14mr11674634wrn.214.1579708019395; Wed, 22 Jan 2020 07:46:59 -0800 (PST) X-Google-Smtp-Source: APXvYqyh4ISQmHOUO7j48EozVyRuuy0usQRT+8U03M01QKybRiDwzu+JmCxliZKMquLwiX3VKpCgDg== X-Received: by 2002:adf:e5ce:: with SMTP id a14mr11674620wrn.214.1579708019223; Wed, 22 Jan 2020 07:46:59 -0800 (PST) Received: from omos.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id c5sm4811788wmb.9.2020.01.22.07.46.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 07:46:58 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace 2/4] libsepol: remove unused cil_mem_error_handler Date: Wed, 22 Jan 2020 16:46:53 +0100 Message-Id: <20200122154655.257233-3-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200122154655.257233-1-omosnace@redhat.com> References: <20200122154655.257233-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 It is declared in an internal header but never defined. Remove it. Signed-off-by: Ondrej Mosnacek --- libsepol/cil/src/cil_mem.h | 1 - libsepol/cil/src/cil_strpool.c | 2 -- 2 files changed, 3 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..508541d6 100644 --- a/libsepol/cil/src/cil_strpool.c +++ b/libsepol/cil/src/cil_strpool.c @@ -80,7 +80,6 @@ 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); } } @@ -104,7 +103,6 @@ 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; } } From patchwork Wed Jan 22 15:46:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11345979 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 08C09139A for ; Wed, 22 Jan 2020 15:47:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBBB424125 for ; Wed, 22 Jan 2020 15:47:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NmkSoyG3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725868AbgAVPrF (ORCPT ); Wed, 22 Jan 2020 10:47:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55985 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725924AbgAVPrF (ORCPT ); Wed, 22 Jan 2020 10:47:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579708024; 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=LYfRnkQJdMTx1mbzdd7g82oChTdJdhTvJ8PHrPBQXYE=; b=NmkSoyG35srm3EuFUZveo785NPZ82EedqKhVwclscc2xwQ49xVgyk12PKrUsp089smr5IT gA8O+ua7rBUNU/+SDIB/xCAO1kI6bE83Kjxi33XczMgeghImPylKo0OWBhPlGW96p4LX4X +BPARWmB4etRzCDIfQtRRGvw1ZncbjI= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-mO4XHkb4PiWDFC2KSOoGAQ-1; Wed, 22 Jan 2020 10:47:01 -0500 X-MC-Unique: mO4XHkb4PiWDFC2KSOoGAQ-1 Received: by mail-wr1-f70.google.com with SMTP id f15so3297821wrr.2 for ; Wed, 22 Jan 2020 07:47:01 -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=LYfRnkQJdMTx1mbzdd7g82oChTdJdhTvJ8PHrPBQXYE=; b=kdh40lR2LykITynE+4AH0Up97VjElMp20GXQB/panydrnoQP8zxTVuItIfjBB6Fub6 CwJbvA9RI6YoCMHvQLjK57CrzAMSYPu9TYpGawWnmyIcbvMZ41TzIgtrI5N+g1A0c89Q hdP4ALWu5f9/SeN8rLzc8QpEkTRgppbgPDtirsjbloiWt5+Wnqyba4GYKd5BawKQke3S TJD/c2FLuBe9gva/CSHrn5x1VkodtW5ttmKArfwTSoKDo6b5pN1NMaf0IdR7GkeDx+Ai qAT0Z8BOKqUk5AHRskepHryiJBNpxaVD+kB5yCtq0yYMRBExV+9RewJSFhjlTRwo0XTR TD/A== X-Gm-Message-State: APjAAAXbeBDsUtZdgN/Vtwj7wFImjeVJ1MQ/HgiujRYNGK4AX4O6tWzr hm5y12PWFMJ7oQxuxT29ufMhHrHfy0W2XxFEfvPEGWRJC9K8vFD9OmjuCrix4TusdE9upp71GfC 85KUWKx1U9NOrLVQdGA== X-Received: by 2002:a1c:67c3:: with SMTP id b186mr3595316wmc.36.1579708020289; Wed, 22 Jan 2020 07:47:00 -0800 (PST) X-Google-Smtp-Source: APXvYqydvImKur+0/nwMa05WNR2Frp23x6SbVj3dtJ77rAfQEnDgIzkj20cfnW0mnlC1JkTrzq8Xsg== X-Received: by 2002:a1c:67c3:: with SMTP id b186mr3595306wmc.36.1579708020134; Wed, 22 Jan 2020 07:47:00 -0800 (PST) Received: from omos.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id c5sm4811788wmb.9.2020.01.22.07.46.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 07:46:59 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace 3/4] checkpolicy: remove unused te_assertions Date: Wed, 22 Jan 2020 16:46:54 +0100 Message-Id: <20200122154655.257233-4-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200122154655.257233-1-omosnace@redhat.com> References: <20200122154655.257233-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. Remove it. Signed-off-by: Ondrej Mosnacek --- checkpolicy/checkpolicy.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/checkpolicy/checkpolicy.h b/checkpolicy/checkpolicy.h index 3868f1fa..8fbc1b7d 100644 --- a/checkpolicy/checkpolicy.h +++ b/checkpolicy/checkpolicy.h @@ -13,8 +13,6 @@ typedef struct te_assert { struct te_assert *next; } te_assert_t; -te_assert_t *te_assertions; - extern unsigned int policyvers; #endif From patchwork Wed Jan 22 15:46:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 11345981 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 33C1F109A for ; Wed, 22 Jan 2020 15:47:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 125A024125 for ; Wed, 22 Jan 2020 15:47:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H6ilF9xh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725943AbgAVPrF (ORCPT ); Wed, 22 Jan 2020 10:47:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60262 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725884AbgAVPrF (ORCPT ); Wed, 22 Jan 2020 10:47:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579708024; 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=H6ilF9xh/ZSbKQW+73Vatm1KQGAOoC84yUbBmk5ZgrOTethpLY7XDd4HQ0EFs365fWYUnP YcOGZHsXmC8MSlHD1r3F8jKBawI4GAt+GV4cJAmhg2gLvnbL4WQm+ywIaIDJCSqQw7CfpI FkmGwIxEy/n/QnVuUHNU9bV/BC2JaCE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-jvgkadv6PbSF0VZHggMo2w-1; Wed, 22 Jan 2020 10:47:02 -0500 X-MC-Unique: jvgkadv6PbSF0VZHggMo2w-1 Received: by mail-wr1-f72.google.com with SMTP id f15so3297837wrr.2 for ; Wed, 22 Jan 2020 07:47:02 -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=OXeJDgFpazEyOXaDg6ALlG/L2M6r2nniI3Al5VG1NzK376pTQBwzNfb+5XUlo+Qqzm JWcfbWLCPBBq1evP5H6A77gOKSLmV/ogFoY+hLkvZFVj7TIOSeQlkyVlCKbSWvFgD0Rb 38ZAi2+LeSy/bvlJyOweavnfuC6LajyVz98E3Dbzhbzv16nXN7yGbpoXFqOJYBDpgKIg iMqm6Uq8mUfuPNCBK5IqPQPiWeCf3hlIWojbBifTXR4LjN2thpzQ3awtqGPBGhs4LKSb KTZMwx3gHj514ytu+2lwWoYujuHHf0/ov8f/FBcMQBzz9vf8fNrIpKMKZHzwjZd2Slv8 8k3A== X-Gm-Message-State: APjAAAULE94H82p1hRQSK7BUDxQMdWWMVzO3lVGONa4/km6SEHNAzlC0 gt8v6jkOt59YlymWS0JagUVLVf6bkgcv32RamI8M/aL2s1eao7glQ89duhVY6g4eZAcd95r1N6v 5nhEHaVqGts/yNeyglA== X-Received: by 2002:a1c:f20c:: with SMTP id s12mr3552693wmc.173.1579708021402; Wed, 22 Jan 2020 07:47:01 -0800 (PST) X-Google-Smtp-Source: APXvYqypjlyIFaNoMRmP/3Uu3vKBSUowl/D0/pZia07ifYj15VpyhoZ5Q0sulGp+HmPxXvdZlMU4tA== X-Received: by 2002:a1c:f20c:: with SMTP id s12mr3552684wmc.173.1579708021249; Wed, 22 Jan 2020 07:47:01 -0800 (PST) Received: from omos.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id c5sm4811788wmb.9.2020.01.22.07.47.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 07:47:00 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace 4/4] Makefile: always build with -fno-common Date: Wed, 22 Jan 2020 16:46:55 +0100 Message-Id: <20200122154655.257233-5-omosnace@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200122154655.257233-1-omosnace@redhat.com> References: <20200122154655.257233-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 --- 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),)