diff --git libselinux-2.6/Makefile libselinux-2.6/Makefile

index baa0db3..b2fbff3 100644

--- libselinux-2.6/Makefile

+++ libselinux-2.6/Makefile

@@ -1,4 +1,4 @@

-SUBDIRS = src include utils man

+SUBDIRS = src include utils man golang

 DISABLE_SETRANS ?= n

 DISABLE_RPM ?= n

diff --git libselinux-2.6/golang/Makefile libselinux-2.6/golang/Makefile

new file mode 100644

index 0000000..b75677b

--- /dev/null

+++ libselinux-2.6/golang/Makefile

@@ -0,0 +1,22 @@

+# Installation directories.

+PREFIX ?= $(DESTDIR)/usr

+LIBDIR ?= $(DESTDIR)/usr/lib

+GODIR ?= $(LIBDIR)/golang/src/pkg/github.com/selinux

+all:

+

+install: 

+	[ -d $(GODIR) ] || mkdir -p $(GODIR)

+	install -m 644 selinux.go $(GODIR)

+

+test:

+	@mkdir selinux

+	@cp selinux.go selinux

+	GOPATH=$(pwd) go run test.go 

+	@rm -rf selinux

+

+clean:

+	@rm -f *~

+	@rm -rf selinux

+indent:

+

+relabel:

diff --git libselinux-2.6/golang/selinux.go libselinux-2.6/golang/selinux.go

new file mode 100644

index 0000000..34bf6bb

--- /dev/null

+++ libselinux-2.6/golang/selinux.go

@@ -0,0 +1,412 @@

+package selinux

+

+/*

+ The selinux package is a go bindings to libselinux required to add selinux

+ support to docker.

+

+ Author Dan Walsh <dwalsh@redhat.com>

+

+ Used some ideas/code from the go-ini packages https://github.com/vaughan0

+ By Vaughan Newton

+*/

+

+// #cgo pkg-config: libselinux

+// #include <selinux/selinux.h>

+// #include <stdlib.h>

+import "C"

+import (

+	"bufio"

+	"crypto/rand"

+	"encoding/binary"

+	"fmt"

+	"io"

+	"os"

+	"path"

+	"path/filepath"

+	"regexp"

+	"strings"

+	"unsafe"

+)

+

+var (

+	assignRegex = regexp.MustCompile(`^([^=]+)=(.*)$`)

+	mcsList     = make(map[string]bool)

+)

+

+func Matchpathcon(path string, mode os.FileMode) (string, error) {

+	var con C.security_context_t

+	var scon string

+	rc, err := C.matchpathcon(C.CString(path), C.mode_t(mode), &con)

+	if rc == 0 {

+		scon = C.GoString(con)

+		C.free(unsafe.Pointer(con))

+	}

+	return scon, err

+}

+

+func Setfilecon(path, scon string) (int, error) {

+	rc, err := C.lsetfilecon(C.CString(path), C.CString(scon))

+	return int(rc), err

+}

+

+func Getfilecon(path string) (string, error) {

+	var scon C.security_context_t

+	var fcon string

+	rc, err := C.lgetfilecon(C.CString(path), &scon)

+	if rc >= 0 {

+		fcon = C.GoString(scon)

+		err = nil

+	}

+	return fcon, err

+}

+

+func Setfscreatecon(scon string) (int, error) {

+	var (

+		rc  C.int

+		err error

+	)

+	if scon != "" {

+		rc, err = C.setfscreatecon(C.CString(scon))

+	} else {

+		rc, err = C.setfscreatecon(nil)

+	}

+	return int(rc), err

+}

+

+func Getfscreatecon() (string, error) {

+	var scon C.security_context_t

+	var fcon string

+	rc, err := C.getfscreatecon(&scon)

+	if rc >= 0 {

+		fcon = C.GoString(scon)

+		err = nil

+		C.freecon(scon)

+	}

+	return fcon, err

+}

+

+func Getcon() string {

+	var pcon C.security_context_t

+	C.getcon(&pcon)

+	scon := C.GoString(pcon)

+	C.freecon(pcon)

+	return scon

+}

+

+func Getpidcon(pid int) (string, error) {

+	var pcon C.security_context_t

+	var scon string

+	rc, err := C.getpidcon(C.pid_t(pid), &pcon)

+	if rc >= 0 {

+		scon = C.GoString(pcon)

+		C.freecon(pcon)

+		err = nil

+	}

+	return scon, err

+}

+

+func Getpeercon(socket int) (string, error) {

+	var pcon C.security_context_t

+	var scon string

+	rc, err := C.getpeercon(C.int(socket), &pcon)

+	if rc >= 0 {

+		scon = C.GoString(pcon)

+		C.freecon(pcon)

+		err = nil

+	}

+	return scon, err

+}

+

+func Setexeccon(scon string) error {

+	var val *C.char

+	if !SelinuxEnabled() {

+		return nil

+	}

+	if scon != "" {

+		val = C.CString(scon)

+	} else {

+		val = nil

+	}

+	_, err := C.setexeccon(val)

+	return err

+}

+

+type Context struct {

+	con []string

+}

+

+func (c *Context) SetUser(user string) {

+	c.con[0] = user

+}

+func (c *Context) GetUser() string {

+	return c.con[0]

+}

+func (c *Context) SetRole(role string) {

+	c.con[1] = role

+}

+func (c *Context) GetRole() string {

+	return c.con[1]

+}

+func (c *Context) SetType(setype string) {

+	c.con[2] = setype

+}

+func (c *Context) GetType() string {

+	return c.con[2]

+}

+func (c *Context) SetLevel(mls string) {

+	c.con[3] = mls

+}

+func (c *Context) GetLevel() string {

+	return c.con[3]

+}

+func (c *Context) Get() string {

+	return strings.Join(c.con, ":")

+}

+func (c *Context) Set(scon string) {

+	c.con = strings.SplitN(scon, ":", 4)

+}

+func NewContext(scon string) Context {

+	var con Context

+	con.Set(scon)

+	return con

+}

+

+func SelinuxEnabled() bool {

+	b := C.is_selinux_enabled()

+	if b > 0 {

+		return true

+	}

+	return false

+}

+

+const (

+	Enforcing  = 1

+	Permissive = 0

+	Disabled   = -1

+)

+

+func SelinuxGetEnforce() int {

+	return int(C.security_getenforce())

+}

+

+func SelinuxGetEnforceMode() int {

+	var enforce C.int

+	C.selinux_getenforcemode(&enforce)

+	return int(enforce)

+}

+

+func mcsAdd(mcs string) {

+	mcsList[mcs] = true

+}

+

+func mcsDelete(mcs string) {

+	mcsList[mcs] = false

+}

+

+func mcsExists(mcs string) bool {

+	return mcsList[mcs]

+}

+

+func IntToMcs(id int, catRange uint32) string {

+	if (id < 1) || (id > 523776) {

+		return ""

+	}

+

+	SETSIZE := int(catRange)

+	TIER := SETSIZE

+

+	ORD := id

+	for ORD > TIER {

+		ORD = ORD - TIER

+		TIER -= 1

+	}

+	TIER = SETSIZE - TIER

+	ORD = ORD + TIER

+	return fmt.Sprintf("s0:c%d,c%d", TIER, ORD)

+}

+

+func uniqMcs(catRange uint32) string {

+	var n uint32

+	var c1, c2 uint32

+	var mcs string

+	for {

+		binary.Read(rand.Reader, binary.LittleEndian, &n)

+		c1 = n % catRange

+		binary.Read(rand.Reader, binary.LittleEndian, &n)

+		c2 = n % catRange

+		if c1 == c2 {

+			continue

+		} else {

+			if c1 > c2 {

+				t := c1

+				c1 = c2

+				c2 = t

+			}

+		}

+		mcs = fmt.Sprintf("s0:c%d,c%d", c1, c2)

+		if mcsExists(mcs) {

+			continue

+		}

+		mcsAdd(mcs)

+		break

+	}

+	return mcs

+}

+func freeContext(processLabel string) {

+	var scon Context

+	scon = NewContext(processLabel)

+	mcsDelete(scon.GetLevel())

+}

+

+func GetLxcContexts() (processLabel string, fileLabel string) {

+	var val, key string

+	var bufin *bufio.Reader

+	if !SelinuxEnabled() {

+		return

+	}

+	lxcPath := C.GoString(C.selinux_lxc_contexts_path())

+	fileLabel = "system_u:object_r:svirt_sandbox_file_t:s0"

+	processLabel = "system_u:system_r:svirt_lxc_net_t:s0"

+

+	in, err := os.Open(lxcPath)

+	if err != nil {

+		goto exit

+	}

+

+	defer in.Close()

+	bufin = bufio.NewReader(in)

+

+	for done := false; !done; {

+		var line string

+		if line, err = bufin.ReadString('\n'); err != nil {

+			if err == io.EOF {

+				done = true

+			} else {

+				goto exit

+			}

+		}

+		line = strings.TrimSpace(line)

+		if len(line) == 0 {

+			// Skip blank lines

+			continue

+		}

+		if line[0] == ';' || line[0] == '#' {

+			// Skip comments

+			continue

+		}

+		if groups := assignRegex.FindStringSubmatch(line); groups != nil {

+			key, val = strings.TrimSpace(groups[1]), strings.TrimSpace(groups[2])

+			if key == "process" {

+				processLabel = strings.Trim(val, "\"")

+			}

+			if key == "file" {

+				fileLabel = strings.Trim(val, "\"")

+			}

+		}

+	}

+exit:

+	var scon Context

+	mcs := IntToMcs(os.Getpid(), 1024)

+	scon = NewContext(processLabel)

+	scon.SetLevel(mcs)

+	processLabel = scon.Get()

+	scon = NewContext(fileLabel)

+	scon.SetLevel(mcs)

+	fileLabel = scon.Get()

+	return processLabel, fileLabel

+}

+

+func CopyLevel(src, dest string) (string, error) {

+	if !SelinuxEnabled() {

+		return "", nil

+	}

+	if src == "" {

+		return "", nil

+	}

+	rc, err := C.security_check_context(C.CString(src))

+	if rc != 0 {

+		return "", err

+	}

+	rc, err = C.security_check_context(C.CString(dest))

+	if rc != 0 {

+		return "", err

+	}

+	scon := NewContext(src)

+	tcon := NewContext(dest)

+	tcon.SetLevel(scon.GetLevel())

+	return tcon.Get(), nil

+}

+

+func RestoreCon(fpath string, recurse bool) error {

+	var flabel string

+	var err error

+	var fs os.FileInfo

+

+	if !SelinuxEnabled() {

+		return nil

+	}

+

+	if recurse {

+		var paths []string

+		var err error

+

+		if paths, err = filepath.Glob(path.Join(fpath, "**", "*")); err != nil {

+			return fmt.Errorf("Unable to find directory %v: %v", fpath, err)

+		}

+

+		for _, fpath := range paths {

+			if err = RestoreCon(fpath, false); err != nil {

+				return fmt.Errorf("Unable to restore selinux context for %v: %v", fpath, err)

+			}

+		}

+		return nil

+	}

+	if fs, err = os.Stat(fpath); err != nil {

+		return fmt.Errorf("Unable stat %v: %v", fpath, err)

+	}

+

+	if flabel, err = Matchpathcon(fpath, fs.Mode()); flabel == "" {

+		return fmt.Errorf("Unable to get context for %v: %v", fpath, err)

+	}

+

+	if rc, err := Setfilecon(fpath, flabel); rc != 0 {

+		return fmt.Errorf("Unable to set selinux context for %v: %v", fpath, err)

+	}

+

+	return nil

+}

+

+func Test() {

+	var plabel, flabel string

+	if !SelinuxEnabled() {

+		return

+	}

+

+	plabel, flabel = GetLxcContexts()

+	fmt.Println(plabel)

+	fmt.Println(flabel)

+	freeContext(plabel)

+	plabel, flabel = GetLxcContexts()

+	fmt.Println(plabel)

+	fmt.Println(flabel)

+	freeContext(plabel)

+	if SelinuxEnabled() {

+		fmt.Println("Enabled")

+	} else {

+		fmt.Println("Disabled")

+	}

+	fmt.Println("getenforce ", SelinuxGetEnforce())

+	fmt.Println("getenforcemode ", SelinuxGetEnforceMode())

+	flabel, _ = Matchpathcon("/home/dwalsh/.emacs", 0)

+	fmt.Println(flabel)

+	pid := os.Getpid()

+	fmt.Printf("PID:%d MCS:%s\n", pid, IntToMcs(pid, 1023))

+	fmt.Println(Getcon())

+	fmt.Println(Getfilecon("/etc/passwd"))

+	fmt.Println(Getpidcon(1))

+	Setfscreatecon("unconfined_u:unconfined_r:unconfined_t:s0")

+	fmt.Println(Getfscreatecon())

+	Setfscreatecon("")

+	fmt.Println(Getfscreatecon())

+	fmt.Println(Getpidcon(1))

+}

diff --git libselinux-2.6/golang/test.go libselinux-2.6/golang/test.go

new file mode 100644

index 0000000..fed6de8

--- /dev/null

+++ libselinux-2.6/golang/test.go

@@ -0,0 +1,9 @@

+package main

+

+import (

+	"./selinux"

+)

+

+func main() {

+	selinux.Test()

+}

diff --git libselinux-2.6/include/selinux/restorecon.h libselinux-2.6/include/selinux/restorecon.h

index 7cfdee1..de694cd 100644

--- libselinux-2.6/include/selinux/restorecon.h

+++ libselinux-2.6/include/selinux/restorecon.h

@@ -50,9 +50,9 @@ extern int selinux_restorecon(const char *pathname,

  */

 #define SELINUX_RESTORECON_VERBOSE			0x0010

 /*

- * Show progress by printing * to stdout every 1000 files, unless

- * relabeling the entire OS, that will then show the approximate

- * percentage complete.

+ * If SELINUX_RESTORECON_PROGRESS is true and

+ * SELINUX_RESTORECON_MASS_RELABEL is true, then output approx % complete,

+ * else output the number of files in 1k blocks processed to stdout.

  */

 #define SELINUX_RESTORECON_PROGRESS			0x0020

 /*

@@ -91,6 +91,11 @@ extern int selinux_restorecon(const char *pathname,

  * mounts to be excluded from relabeling checks.

  */

 #define SELINUX_RESTORECON_IGNORE_MOUNTS		0x2000

+/*

+ * Set if there is a mass relabel required.

+ * See SELINUX_RESTORECON_PROGRESS flag for details.

+ */

+#define SELINUX_RESTORECON_MASS_RELABEL			0x4000

 /**

  * selinux_restorecon_set_sehandle - Set the global fc handle.

diff --git libselinux-2.6/man/man3/selinux_restorecon.3 libselinux-2.6/man/man3/selinux_restorecon.3

index 2d8274b..3350f9c 100644

--- libselinux-2.6/man/man3/selinux_restorecon.3

+++ libselinux-2.6/man/man3/selinux_restorecon.3

@@ -88,8 +88,16 @@ will take precedence.

 .RE

 .sp

 .B SELINUX_RESTORECON_PROGRESS

-show progress by printing * to stdout every 1000 files unless relabeling the

-entire OS, that will then show the approximate percentage complete.

+show progress by outputting the number of files in 1k blocks processed

+to stdout. If the

+.B SELINUX_RESTORECON_MASS_RELABEL

+flag is also set then the approximate percentage complete will be shown.

+.sp

+.B SELINUX_RESTORECON_MASS_RELABEL

+generally set when relabeling the entire OS, that will then show the

+approximate percentage complete. The

+.B SELINUX_RESTORECON_PROGRESS

+flag must also be set.

 .sp

 .B SELINUX_RESTORECON_REALPATH

 convert passed-in

diff --git libselinux-2.6/man/man8/selinux.8 libselinux-2.6/man/man8/selinux.8

index 6f1034b..c9f188c 100644

--- libselinux-2.6/man/man8/selinux.8

+++ libselinux-2.6/man/man8/selinux.8

@@ -91,11 +91,13 @@ This manual page was written by Dan Walsh <dwalsh@redhat.com>.

 .BR sepolicy (8),

 .BR system-config-selinux (8),

 .BR togglesebool (8),

-.BR restorecon (8),

 .BR fixfiles (8),

+.BR restorecon (8),

 .BR setfiles (8),

 .BR semanage (8),

-.BR sepolicy(8)

+.BR sepolicy(8),

+.BR seinfo(8),

+.BR sesearch(8)

 Every confined service on the system has a man page in the following format:

 .br

diff --git libselinux-2.6/src/Makefile libselinux-2.6/src/Makefile

index 13501cd..956ea1c 100644

--- libselinux-2.6/src/Makefile

+++ libselinux-2.6/src/Makefile

@@ -2,7 +2,7 @@

 # runtimes (e.g. Python 2 vs Python 3) by optionally prefixing the build

 # targets with "PYPREFIX":

 PYTHON ?= python

-PYPREFIX ?= $(notdir $(PYTHON))

+PYPREFIX ?= $(shell $(PYTHON) -c 'import sys;print("python%d" % sys.version_info[0])')

 RUBY ?= ruby

 RUBYPREFIX ?= $(notdir $(RUBY))

 PKG_CONFIG ?= pkg-config

diff --git libselinux-2.6/src/avc_sidtab.c libselinux-2.6/src/avc_sidtab.c

index 9669264..c775430 100644

--- libselinux-2.6/src/avc_sidtab.c

+++ libselinux-2.6/src/avc_sidtab.c

@@ -81,6 +81,11 @@ sidtab_context_to_sid(struct sidtab *s,

 	int hvalue, rc = 0;

 	struct sidtab_node *cur;

+	if (! ctx) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	*sid = NULL;

 	hvalue = sidtab_hash(ctx);

diff --git libselinux-2.6/src/booleans.c libselinux-2.6/src/booleans.c

index cbb0610..9cffffe 100644

--- libselinux-2.6/src/booleans.c

+++ libselinux-2.6/src/booleans.c

@@ -55,6 +55,7 @@ int security_get_boolean_names(char ***names, int *len)

 	snprintf(path, sizeof path, "%s%s", selinux_mnt, SELINUX_BOOL_DIR);

 	*len = scandir(path, &namelist, &filename_select, alphasort);

 	if (*len <= 0) {

+		errno = ENOENT;

 		return -1;

 	}

diff --git libselinux-2.6/src/canonicalize_context.c libselinux-2.6/src/canonicalize_context.c

index 7cf3139..364a746 100644

--- libselinux-2.6/src/canonicalize_context.c

+++ libselinux-2.6/src/canonicalize_context.c

@@ -17,6 +17,11 @@ int security_canonicalize_context_raw(const char * con,

 	size_t size;

 	int fd, ret;

+	if (! con) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	if (!selinux_mnt) {

 		errno = ENOENT;

 		return -1;

diff --git libselinux-2.6/src/check_context.c libselinux-2.6/src/check_context.c

index 52063fa..234749c 100644

--- libselinux-2.6/src/check_context.c

+++ libselinux-2.6/src/check_context.c

@@ -14,6 +14,11 @@ int security_check_context_raw(const char * con)

 	char path[PATH_MAX];

 	int fd, ret;

+	if (! con) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	if (!selinux_mnt) {

 		errno = ENOENT;

 		return -1;

diff --git libselinux-2.6/src/compute_av.c libselinux-2.6/src/compute_av.c

index 937e5c3..35ace7f 100644

--- libselinux-2.6/src/compute_av.c

+++ libselinux-2.6/src/compute_av.c

@@ -26,6 +26,11 @@ int security_compute_av_flags_raw(const char * scon,

 		return -1;

 	}

+	if ((! scon) || (! tcon)) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	snprintf(path, sizeof path, "%s/access", selinux_mnt);

 	fd = open(path, O_RDWR);

 	if (fd < 0)

diff --git libselinux-2.6/src/compute_create.c libselinux-2.6/src/compute_create.c

index 9559d42..14a65d1 100644

--- libselinux-2.6/src/compute_create.c

+++ libselinux-2.6/src/compute_create.c

@@ -64,6 +64,11 @@ int security_compute_create_name_raw(const char * scon,

 		return -1;

 	}

+	if ((! scon) || (! tcon)) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	snprintf(path, sizeof path, "%s/create", selinux_mnt);

 	fd = open(path, O_RDWR);

 	if (fd < 0)

diff --git libselinux-2.6/src/compute_member.c libselinux-2.6/src/compute_member.c

index 1fc7e41..065d996 100644

--- libselinux-2.6/src/compute_member.c

+++ libselinux-2.6/src/compute_member.c

@@ -25,6 +25,11 @@ int security_compute_member_raw(const char * scon,

 		return -1;

 	}

+	if ((! scon) || (! tcon)) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	snprintf(path, sizeof path, "%s/member", selinux_mnt);

 	fd = open(path, O_RDWR);

 	if (fd < 0)

diff --git libselinux-2.6/src/compute_relabel.c libselinux-2.6/src/compute_relabel.c

index 4615aee..cc77f36 100644

--- libselinux-2.6/src/compute_relabel.c

+++ libselinux-2.6/src/compute_relabel.c

@@ -25,6 +25,11 @@ int security_compute_relabel_raw(const char * scon,

 		return -1;

 	}

+	if ((! scon) || (! tcon)) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);

 	fd = open(path, O_RDWR);

 	if (fd < 0)

diff --git libselinux-2.6/src/compute_user.c libselinux-2.6/src/compute_user.c

index b37c5d3..7703c26 100644

--- libselinux-2.6/src/compute_user.c

+++ libselinux-2.6/src/compute_user.c

@@ -24,6 +24,11 @@ int security_compute_user_raw(const char * scon,

 		return -1;

 	}

+	if (! scon) {

+		errno=EINVAL;

+		return -1;

+	}

+

 	snprintf(path, sizeof path, "%s/user", selinux_mnt);

 	fd = open(path, O_RDWR);

 	if (fd < 0)

diff --git libselinux-2.6/src/fsetfilecon.c libselinux-2.6/src/fsetfilecon.c

index 52707d0..0cbe12d 100644

--- libselinux-2.6/src/fsetfilecon.c

+++ libselinux-2.6/src/fsetfilecon.c

@@ -9,8 +9,12 @@

 int fsetfilecon_raw(int fd, const char * context)

 {

-	int rc = fsetxattr(fd, XATTR_NAME_SELINUX, context, strlen(context) + 1,

-			 0);

+	int rc;

+	if (! context) {

+		errno=EINVAL;

+		return -1;

+	}

+	rc = fsetxattr(fd, XATTR_NAME_SELINUX, context, strlen(context) + 1, 0);

 	if (rc < 0 && errno == ENOTSUP) {

 		char * ccontext = NULL;

 		int err = errno;

diff --git libselinux-2.6/src/lsetfilecon.c libselinux-2.6/src/lsetfilecon.c