From patchwork Wed Sep 28 15:26:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberts, William C" X-Patchwork-Id: 9354091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B88760756 for ; Wed, 28 Sep 2016 15:27:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B1FE296DF for ; Wed, 28 Sep 2016 15:27:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FF20296E1; Wed, 28 Sep 2016 15:27:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00 autolearn=ham version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (smtp.nsa.gov [8.44.101.8]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 92E5F296DF for ; Wed, 28 Sep 2016 15:27:26 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.30,410,1470700800"; d="scan'208";a="18059046" IronPort-PHdr: =?us-ascii?q?9a23=3AnWFH6hPEKZPaPZdFSnEl6mtUPXoX/o7sNwtQ0KIM?= =?us-ascii?q?zox0KPX7rarrMEGX3/hxlliBBdydsKMezbOJ+PC7EUU7or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6anHS+4HYoFwnlMkIt?= =?us-ascii?q?f6KuS9SU1pv8h7v60qaQSj0AvCC6b7J2IUf+hiTqne5Sv7FfLL0swADCuHpCdr?= =?us-ascii?q?ce72ppIVWOg0S0vZ/or9Ze6SAYh9YNv44FCP27LOwESulDATAnNX0lzNH6vhnE?= =?us-ascii?q?Cw2U7z0TVXtS2gFFCg7J9hb7UtL1szDmnvZs0ymde8vtRPY7Xirmp7xnUzf0mS?= =?us-ascii?q?wHMHg/62iRhctu34xBpxf0uB17x4/dZceecuB5dK7HYcgyRGxdU8IXXCtEUdD0?= =?us-ascii?q?VJcGE+dUZbUQlIL6vVZb6ELmCA=3D=3D?= X-IPAS-Result: =?us-ascii?q?A2HADQDV4OtX/wHyM5BdGwEBAQMBAQEJAQEBFwEBBAEBCgE?= =?us-ascii?q?BgxQBAQEBAR5XfKYFHwGUJyIDgXgZhVxMAQEBAQEBAQECAQJbJ4IyBAMTBXlbP?= =?us-ascii?q?QIEAQI3FCAOAwkBARcIIQgIAwEtFREHBwsFGASILL07ASSIO4ZmEQGFegWZdoY?= =?us-ascii?q?niUQCgjqHQYVvSJAhVIMdHIFsVgGEZ3iBKAEBAQ?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP; 28 Sep 2016 15:27:23 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SFRLV8031142; Wed, 28 Sep 2016 11:27:21 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u8SFQKE7003846 for ; Wed, 28 Sep 2016 11:26:20 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SFQJhI031028; Wed, 28 Sep 2016 11:26:19 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1C0AwDw3+tX/yNjr8ZdGgEBAQECAQEBAQgBAQEBgz8BAQEBAR5XfLZAhBUchgICgWlMAQIBAQEBAQJehQkCBHkQIDFXBxKITb1EAQEIAiWIO4xyBZl2hieJRAKCOo0wSJAhVIMdHIFsIjQBhwcBAQE X-IPAS-Result: A1C0AwDw3+tX/yNjr8ZdGgEBAQECAQEBAQgBAQEBgz8BAQEBAR5XfLZAhBUchgICgWlMAQIBAQEBAQJehQkCBHkQIDFXBxKITb1EAQEIAiWIO4xyBZl2hieJRAKCOo0wSJAhVIMdHIFsIjQBhwcBAQE X-IronPort-AV: E=Sophos;i="5.30,410,1470715200"; d="scan'208";a="5733764" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 28 Sep 2016 11:26:19 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3ALQ3dsxNTO4zQySfqjgAl6mtUPXoX/o7sNwtQ0KIM?= =?us-ascii?q?zox0Kf3+rarrMEGX3/hxlliBBdydsKMezbOJ+PC7EUU7or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6anHS+4HYoFwnlMkIt?= =?us-ascii?q?f6KuS9SU1pv8h7v60qaQSj0AvCC6b7J2IUf+hiTqne5Sv7FfLL0swADCuHpCdr?= =?us-ascii?q?ce72ppIVWOg0S0vZ/or9ZLuh5dsPM59sNGTb6yP+FhFeQZXwIdNHop6cHRuBLC?= =?us-ascii?q?VVHHpidEEzZerh0dGAXB7RfnTr/toyD6sax7wyDcMsroCfgvVD2k471sSROtjC?= =?us-ascii?q?YcKxYl4WrXjYp2l6sdrxW/41Rkz5X8fJCeNP04eLjUO9wdWzlvRMFUAjNABoe9?= =?us-ascii?q?Zo5JBKwbOuxVtZXmj1oIsRa6QwKrAbC8ggRUj2P7iPVpm98qFhvLiUl+R98=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0HJCwAt4OtX/yNjr8ZdGgEBAQECAQEBA?= =?us-ascii?q?QgBAQEBFgEBAQMBAQEJAQEBgxQBAQEBAR5XfKYFHwGQG4QVHIF4GYNxAoFpTAE?= =?us-ascii?q?BAQEBAQEBAgECWyeCMgQBFQV5Wz0CBHkQIDFXBxKITb01AQEIAgEkiDuMcgWZd?= =?us-ascii?q?oYniUQCgjqNMEiQIVSDHRyBbCI0AYVGgUEBAQE?= X-IPAS-Result: =?us-ascii?q?A0HJCwAt4OtX/yNjr8ZdGgEBAQECAQEBAQgBAQEBFgEBAQM?= =?us-ascii?q?BAQEJAQEBgxQBAQEBAR5XfKYFHwGQG4QVHIF4GYNxAoFpTAEBAQEBAQEBAgECW?= =?us-ascii?q?yeCMgQBFQV5Wz0CBHkQIDFXBxKITb01AQEIAgEkiDuMcgWZdoYniUQCgjqNMEi?= =?us-ascii?q?QIVSDHRyBbCI0AYVGgUEBAQE?= X-IronPort-AV: E=Sophos;i="5.30,410,1470700800"; d="scan'208";a="19627238" Received: from fmsmga002-icc.fm.intel.com ([198.175.99.35]) by emsm-gh1-uea11.nsa.gov with ESMTP; 28 Sep 2016 15:26:18 +0000 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.30,410,1470726000"; d="scan'208"; a="1063490897" Received: from vjain9-mobl4.amr.corp.intel.com (HELO wcrobert-MOBL1.amr.corp.intel.com) ([10.254.64.186]) by fmsmga002.fm.intel.com with ESMTP; 28 Sep 2016 08:26:17 -0700 From: william.c.roberts@intel.com To: selinux@tycho.nsa.gov, seandroid-list@tycho.nsa.gov, sds@tycho.nsa.gov Subject: [PATCH 2/3] libselinux: drop DISABLE_AVC=y Date: Wed, 28 Sep 2016 11:26:08 -0400 Message-Id: <1475076369-13586-2-git-send-email-william.c.roberts@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475076369-13586-1-git-send-email-william.c.roberts@intel.com> References: <1475076369-13586-1-git-send-email-william.c.roberts@intel.com> X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: William Roberts Remove build config DISABLE_AVC, it is unused and broken. Signed-off-by: William Roberts --- libselinux/Makefile | 6 +----- libselinux/src/Makefile | 3 --- libselinux/src/mapping.h | 7 ------- libselinux/utils/Makefile | 3 --- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/libselinux/Makefile b/libselinux/Makefile index d1532e8..c96695d 100644 --- a/libselinux/Makefile +++ b/libselinux/Makefile @@ -1,12 +1,8 @@ SUBDIRS = src include utils man -DISABLE_AVC ?= n DISABLE_SETRANS ?= n DISABLE_RPM ?= n DISABLE_BOOL ?= n -ifeq ($(DISABLE_AVC),y) - EMFLAGS+= -DDISABLE_AVC -endif ifeq ($(DISABLE_BOOL),y) EMFLAGS+= -DDISABLE_BOOL endif @@ -16,7 +12,7 @@ endif ifeq ($(DISABLE_SETRANS),y) EMFLAGS+= -DDISABLE_SETRANS endif -export DISABLE_AVC DISABLE_SETRANS DISABLE_RPM DISABLE_BOOL EMFLAGS +export DISABLE_SETRANS DISABLE_RPM DISABLE_BOOL EMFLAGS USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index 36e42b8..8cfdf34 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -41,9 +41,6 @@ LIBSO=$(TARGET).$(LIBVERSION) AUDIT2WHYLOBJ=$(PYPREFIX)audit2why.lo AUDIT2WHYSO=$(PYPREFIX)audit2why.so -ifeq ($(DISABLE_AVC),y) - UNUSED_SRCS+=avc.c avc_internal.c avc_sidtab.c mapping.c stringrep.c checkAccess.c -endif ifeq ($(DISABLE_BOOL),y) UNUSED_SRCS+=booleans.c endif diff --git a/libselinux/src/mapping.h b/libselinux/src/mapping.h index b96756b..22a4cca 100644 --- a/libselinux/src/mapping.h +++ b/libselinux/src/mapping.h @@ -31,11 +31,4 @@ map_perm(security_class_t tclass, access_vector_t kperm); extern void map_decision(security_class_t tclass, struct av_decision *avd); -/*mapping is not used for embedded build*/ -#ifdef DISABLE_AVC -#define unmap_perm(x,y) y -#define unmap_class(x) x -#define map_decision(x,y) -#endif - #endif /* _SELINUX_MAPPING_H_ */ diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile index 1943bef..9ec928b 100644 --- a/libselinux/utils/Makefile +++ b/libselinux/utils/Makefile @@ -36,9 +36,6 @@ sefcontext_compile: sefcontext_compile.o ../src/regex.o selinux_restorecon: LDLIBS += -lsepol -ifeq ($(DISABLE_AVC),y) - UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel -endif ifeq ($(DISABLE_BOOL),y) UNUSED_TARGETS+=getsebool togglesebool endif