summaryrefslogtreecommitdiff
path: root/src/basic/smack-util.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-03-27 07:38:26 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commitd3bc5662dd8436ea2ddcd49d18a48e9a4818bb44 (patch)
treebaccb383396362a65c110d1dacb630b7e659a804 /src/basic/smack-util.h
parent33da2d049720dfa17bbbbf70200130fd977bfb33 (diff)
label: rework label_fix() implementations (#8583)
This reworks the SELinux and SMACK label fixing calls in a number of ways: 1. The two separate boolean arguments of these functions are converted into a flags type LabelFixFlags. 2. The operations are now implemented based on O_PATH. This should resolve TTOCTTOU races between determining the label for the file system object and applying it, as it it allows to pin the object while we are operating on it. 3. When changing a label fails we'll query the label previously set, and if matches what we want to set anyway we'll suppress the error. Also, all calls to label_fix() are now (void)ified, when we ignore the return values. Fixes: #8566
Diffstat (limited to 'src/basic/smack-util.h')
-rw-r--r--src/basic/smack-util.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index c691fdc12..6f8e3ea0c 100644
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <sys/types.h>
+//#include "label.h"
#include "macro.h"
#define SMACK_FLOOR_LABEL "_"
@@ -32,12 +33,12 @@
#if 0 /// UNNEEDED by elogind
typedef enum SmackAttr {
- SMACK_ATTR_ACCESS = 0,
- SMACK_ATTR_EXEC = 1,
- SMACK_ATTR_MMAP = 2,
- SMACK_ATTR_TRANSMUTE = 3,
- SMACK_ATTR_IPIN = 4,
- SMACK_ATTR_IPOUT = 5,
+ SMACK_ATTR_ACCESS,
+ SMACK_ATTR_EXEC,
+ SMACK_ATTR_MMAP,
+ SMACK_ATTR_TRANSMUTE,
+ SMACK_ATTR_IPIN,
+ SMACK_ATTR_IPOUT,
_SMACK_ATTR_MAX,
_SMACK_ATTR_INVALID = -1,
} SmackAttr;
@@ -45,7 +46,7 @@ typedef enum SmackAttr {
bool mac_smack_use(void);
-int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs);
+int mac_smack_fix(const char *path, LabelFixFlags flags);
#if 0 /// UNNEEDED by elogind
const char* smack_attr_to_string(SmackAttr i) _const_;