From patchwork Sun Apr 24 09:34:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Haines X-Patchwork-Id: 8920121 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AE5C8BF29F for ; Sun, 24 Apr 2016 09:37:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4926D201ED for ; Sun, 24 Apr 2016 09:37:48 +0000 (UTC) Received: from emvm-gh1-uea09.nsa.gov (emvm-gh1-uea09.nsa.gov [8.44.101.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6D43201EC for ; Sun, 24 Apr 2016 09:37:43 +0000 (UTC) X-TM-IMSS-Message-ID: Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id b694ae950000a648 ; Sun, 24 Apr 2016 05:35:39 -0400 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 u3O9ZDCi005807; Sun, 24 Apr 2016 05:35:23 -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 u3O9ZAp0135139 for ; Sun, 24 Apr 2016 05:35:10 -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 u3O9ZAxg005805 for ; Sun, 24 Apr 2016 05:35:10 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CtBAAfkhxX/yQp0ApeKINjfbdlgmqBHgoEEwuFbIFlAQEBAQEBZieFCAEBNwGBUIgUAQMSBAquXIUoAQSBAIcehAUCBIQXiRaCSoF8C0CCQ5gUhXyIG48MAo8vYoF4gXRriXsBAQE X-IPAS-Result: A0CtBAAfkhxX/yQp0ApeKINjfbdlgmqBHgoEEwuFbIFlAQEBAQEBZieFCAEBNwGBUIgUAQMSBAquXIUoAQSBAIcehAUCBIQXiRaCSoF8C0CCQ5gUhXyIG48MAo8vYoF4gXRriXsBAQE X-IronPort-AV: E=Sophos;i="5.24,526,1454994000"; d="scan'208";a="5404585" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 24 Apr 2016 05:35:10 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3Acm5xqxAx1u+M+SRzSnYpUyQJP3N1i/DPJgcQr6Af?= =?us-ascii?q?oPdwSP7+pMbcNUDSrc9gkEXOFd2CrakU26yJ6Ou5BiQp2tWojjMrSNR0TRgLiM?= =?us-ascii?q?EbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpQAbFhi3Dwdp?= =?us-ascii?q?POO9QteU1JTnkb/psMSMKyxzxxODIppKZC2sqgvQssREyaBDEY0WjiXzn31TZu?= =?us-ascii?q?5NznlpL1/A1zz158O34YIxu38I46FppIZ8VvDhcqA5S6FIJCg3OGAyosvwvF/M?= =?us-ascii?q?ShXcyGEbVzAskxFIChLJpDHzX5H8qWOurOt22CCAMfr9erA9WDKv9I9hVB7ulC?= =?us-ascii?q?odMTMltmrQj5oj3+pgvBu9qkknkMbva4aPOa8mcw=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1E9AQARkxxXkIYAFEFehAt9p0ADkCKCa?= =?us-ascii?q?mU5ChcLhWyBZQEBAQEBAQICDwEBAQEJCwkJIYJcCjgKMgEBAQEBAQEBAQEBAQE?= =?us-ascii?q?BAQEBAQEBAQEBARECCAVDAQEdQwEBNwGBUIgUAQMSBAquXIUoAQSBAIcehAUCB?= =?us-ascii?q?IQXiRaCSoF8C0CCQ5gUhXyIG48MAo8vgloegVZriXsBAQE?= X-IPAS-Result: =?us-ascii?q?A1E9AQARkxxXkIYAFEFehAt9p0ADkCKCamU5ChcLhWyBZQE?= =?us-ascii?q?BAQEBAQICDwEBAQEJCwkJIYJcCjgKMgEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA?= =?us-ascii?q?RECCAVDAQEdQwEBNwGBUIgUAQMSBAquXIUoAQSBAIcehAUCBIQXiRaCSoF8C0C?= =?us-ascii?q?CQ5gUhXyIG48MAo8vgloegVZriXsBAQE?= X-IronPort-AV: E=Sophos;i="5.24,526,1454976000"; d="scan'208";a="12959863" Received: from emvm-gh1-uea09.nsa.gov ([10.208.42.194]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-SHA; 24 Apr 2016 09:35:01 +0000 X-TM-IMSS-Message-ID: Received: from rgout0607.bt.lon5.cpcloud.co.uk (rgout0607.bt.lon5.cpcloud.co.uk [65.20.0.134]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id b693a2370000a643 ; Sun, 24 Apr 2016 05:34:30 -0400 X-OWM-Source-IP: 86.150.49.173 (GB) X-OWM-Env-Sender: richard_c_haines@btinternet.com X-CTCH-RefID: str=0001.0A090205.571C9342.007D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-Junkmail-Premium-Raw: score=33/50, refid=2.7.2:2016.4.21.65416:17:33.181, ip=86.150.49.173, rules=__HAS_FROM, __PHISH_FROM2, __FRAUD_WEBMAIL_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __TO_IN_SUBJECT, __ANY_URI, __HTTPS_URI, __FRAUD_BODY_WEBMAIL, __URI_NO_WWW, __CP_URI_IN_BODY, __URI_IN_BODY, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, __URI_NS, SXL_IP_DYNAMIC[173.49.150.86.fur], HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, __FRAUD_WEBMAIL, __PHISH_FROM, __SINGLE_URI_TEXT, SINGLE_URI_IN_BODY, __PHISH_SPEAR_STRUCTURE_1, __URI_NO_PATH, RDNS_SUSP, TO_IN_SUBJECT, BODY_SIZE_7000_LESS X-CTCH-Spam: Unknown Received: from localhost.localdomain (86.150.49.173) by rgout06.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as richard_c_haines@btinternet.com) id 5716233900A26A3D; Sun, 24 Apr 2016 10:34:58 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=btinternet.com; s=btcpcloud; t=1461490500; bh=KcDMR1mMLXHlRKJJhVfCWWcvVG/xtVZR8VfnuFSA6F8=; h=From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=P6HSKaBZjW76pfP9hAXBuHSD5Wt1mLGsZFL32UigWIcpWbY8GeYV7EN47C2zrWQTpkyC0awpJzT0VNceMA1Wi45EqE0xbhZmVVMtzFhPSPQpBXLRlPXt2ZV9RXMSZzdFoI6al7j+M3n5eeG9ZzZ5rFjDD8U2VbeY4/HDxdUG8v4= From: Richard Haines To: selinux@tycho.nsa.gov Subject: [PATCH] selinux: Build policy on systems not supporting DCCP protocol Date: Sun, 24 Apr 2016 10:34:47 +0100 Message-Id: <1461490487-19829-1-git-send-email-richard_c_haines@btinternet.com> X-Mailer: git-send-email 2.5.5 X-TM-AS-MML: disable 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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 3895fbbe0cf2ec52d6b6eda66084b6e9f8d88fb2 ("selinux: Add support for portcon dccp protocol") added support for the (portcon dccp ..) statement. This fix will allow policy to be built on platforms (see [1]) that do not have DCCP support by defining the IANA assigned IP Protocol Number 33 to IPPROTO_DCCP. [1] https://android-review.googlesource.com/#/c/219568/ Signed-off-by: Richard Haines --- checkpolicy/checkpolicy.c | 3 +++ checkpolicy/policy_define.c | 3 +++ libsepol/cil/src/cil_binary.c | 3 +++ libsepol/src/module_to_cil.c | 3 +++ libsepol/src/ports.c | 3 +++ 5 files changed, 15 insertions(+) diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index ea9ee00..7947c20 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -64,6 +64,9 @@ #include #include #include +#ifndef IPPROTO_DCCP +#define IPPROTO_DCCP 33 +#endif #include #include #include diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index 7a4d2f1..2068b71 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -36,6 +36,9 @@ #include #include #include +#ifndef IPPROTO_DCCP +#define IPPROTO_DCCP 33 +#endif #include #include #include diff --git a/libsepol/cil/src/cil_binary.c b/libsepol/cil/src/cil_binary.c index 8233dfd..b8437c9 100644 --- a/libsepol/cil/src/cil_binary.c +++ b/libsepol/cil/src/cil_binary.c @@ -31,6 +31,9 @@ #include #include #include +#ifndef IPPROTO_DCCP +#define IPPROTO_DCCP 33 +#endif #include #include diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c index b478d9f..38f0dc3 100644 --- a/libsepol/src/module_to_cil.c +++ b/libsepol/src/module_to_cil.c @@ -26,6 +26,9 @@ #include #include #include +#ifndef IPPROTO_DCCP +#define IPPROTO_DCCP 33 +#endif #include #include #include diff --git a/libsepol/src/ports.c b/libsepol/src/ports.c index b1ee094..62ec602 100644 --- a/libsepol/src/ports.c +++ b/libsepol/src/ports.c @@ -1,4 +1,7 @@ #include +#ifndef IPPROTO_DCCP +#define IPPROTO_DCCP 33 +#endif #include #include "debug.h"