From e5818a35603d140fddd59a863f52bb048ffde8c1 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Fri, 25 Oct 2013 16:06:28 +0300
Subject: [PATCH] Remove errno assignments

If we want to report something libsmack specific, then we should
have our own error codes. By using errno values to report libsmack
specific error condition we almost zero their value. By removing
these assignment you can resolved from a changed errno value that
a system call failed.

This patch does not break API contract as use of errno values is
undefined in the API documentation.
(cherry picked from commit 1edba541de63b088a60d89e4a0433bf9149c4b13)
---
 libsmack/libsmack.c | 33 ++++++++-------------------------
 utils/common.c      |  7 +------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/libsmack/libsmack.c b/libsmack/libsmack.c
index 343b3bb..e1b8668 100644
--- a/libsmack/libsmack.c
+++ b/libsmack/libsmack.c
@@ -171,10 +171,8 @@ int smack_accesses_add(struct smack_accesses *handle, const char *subject,
 	struct smack_rule *rule = NULL;
 
 	if (strnlen(subject, SMACK_LABEL_LEN + 1) > SMACK_LABEL_LEN ||
-	    strnlen(object, SMACK_LABEL_LEN + 1) > SMACK_LABEL_LEN) {
-		errno = ERANGE;
+	    strnlen(object, SMACK_LABEL_LEN + 1) > SMACK_LABEL_LEN)
 		return -1;
-	}
 
 	rule = calloc(sizeof(struct smack_rule), 1);
 	if (rule == NULL)
@@ -203,10 +201,8 @@ int smack_accesses_add_modify(struct smack_accesses *handle,
 	struct smack_rule *rule = NULL;
 
 	if (strnlen(subject, SMACK_LABEL_LEN + 1) > SMACK_LABEL_LEN ||
-	    strnlen(object, SMACK_LABEL_LEN + 1) > SMACK_LABEL_LEN) {
-		errno = ERANGE;
+	    strnlen(object, SMACK_LABEL_LEN + 1) > SMACK_LABEL_LEN)
 		return -1;
-	}
 
 	rule = calloc(sizeof(struct smack_rule), 1);
 	if (rule == NULL)
@@ -257,7 +253,6 @@ int smack_accesses_add_from_file(struct smack_accesses *accesses, int fd)
 
 		if (subject == NULL || object == NULL || access == NULL ||
 		    strtok_r(NULL, " \t\n", &ptr) != NULL) {
-			errno = EINVAL;
 			fclose(file);
 			return -1;
 		}
@@ -292,10 +287,8 @@ int smack_have_access(const char *subject, const char *object,
 	int access2 = 1;
 	char path[PATH_MAX];
 
-	if (!smackfs_mnt) {
-		errno = EFAULT;
+	if (!smackfs_mnt)
 		return -1; 
-	}
 	
 	snprintf(path, sizeof path, "%s/access2", smackfs_mnt);
 	fd = open(path, O_RDWR);
@@ -374,10 +367,8 @@ int smack_cipso_apply(struct smack_cipso *cipso)
 	char path[PATH_MAX];
 	int offset=0;
 
-	if (!smackfs_mnt) {
-		errno = EFAULT;
+	if (!smackfs_mnt)
 		return -1;
-	}
 
 	snprintf(path, sizeof path, "%s/cipso2", smackfs_mnt);
 	fd = open(path, O_WRONLY);
@@ -439,10 +430,8 @@ int smack_cipso_add_from_file(struct smack_cipso *cipso, int fd)
 		level = strtok_r(NULL, " \t\n", &ptr);
 		cat = strtok_r(NULL, " \t\n", &ptr);
 		if (label == NULL || level == NULL ||
-		    strlen(label) > SMACK_LABEL_LEN) {
-			errno = EINVAL;
+		    strlen(label) > SMACK_LABEL_LEN)
 			goto err_out;
-		}
 
 		strcpy(mapping->label, label);
 
@@ -451,10 +440,8 @@ int smack_cipso_add_from_file(struct smack_cipso *cipso, int fd)
 		if (errno)
 			goto err_out;
 
-		if (val < 0 || val > LEVEL_MAX) {
-			errno = ERANGE;
+		if (val < 0 || val > LEVEL_MAX)
 			goto err_out;
-		}
 
 		mapping->level = val;
 
@@ -464,10 +451,8 @@ int smack_cipso_add_from_file(struct smack_cipso *cipso, int fd)
 			if (errno)
 				goto err_out;
 
-			if (val < 0 || val > CAT_MAX_VALUE) {
-				errno = ERANGE;
+			if (val < 0 || val > CAT_MAX_VALUE)
 				goto err_out;
-			}
 
 			mapping->cats[i] = val;
 
@@ -633,10 +618,8 @@ static int accesses_apply(struct smack_accesses *handle, int clear)
 	int load2 = 1;
 	char path[PATH_MAX];
 
-	if (!smackfs_mnt) {
-		errno = EFAULT;
+	if (!smackfs_mnt)
 		return -1; 
-	}
 	
 	snprintf(path, sizeof path, "%s/load2", smackfs_mnt);
 	load_fd = open(path, O_WRONLY);
diff --git a/utils/common.c b/utils/common.c
index 5ea22fe..39636f1 100644
--- a/utils/common.c
+++ b/utils/common.c
@@ -45,12 +45,7 @@ int clear(void)
 	char path[PATH_MAX];
 
 	smack_mnt = smack_smackfs_path();
-	if (!smack_mnt) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (!smack_smackfs_path())
+	if (!smack_mnt)
 		return -1;
 
 	snprintf(path, sizeof path, "%s/load2", smack_mnt);
-- 
2.7.4