| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1505159427-11747-5-git-send-email-s.mesoraca16@gmail.com>
Date: Mon, 11 Sep 2017 21:50:22 +0200
From: Salvatore Mesoraca <s.mesoraca16@...il.com>
To: linux-kernel@...r.kernel.org
Cc: linux-security-module@...r.kernel.org,
kernel-hardening@...ts.openwall.com,
Salvatore Mesoraca <s.mesoraca16@...il.com>,
Brad Spengler <spender@...ecurity.net>,
PaX Team <pageexec@...email.hu>,
Casey Schaufler <casey@...aufler-ca.com>,
Kees Cook <keescook@...omium.org>,
James Morris <james.l.morris@...cle.com>,
"Serge E. Hallyn" <serge@...lyn.com>
Subject: [RFC v3 4/9] S.A.R.A. cred blob management
Creation of the S.A.R.A. cred blob management "API".
In order to allow S.A.R.A. to be stackable with other LSMs, it doesn't use
the "security" field of struct cred, instead it uses an ad hoc field named
security_sara.
This solution is probably not acceptable for upstream, so this part will
be modified as soon as the LSM stackable cred blob management will be
available.
Signed-off-by: Salvatore Mesoraca <s.mesoraca16@...il.com>
---
include/linux/cred.h | 3 ++
security/sara/Makefile | 2 +-
security/sara/include/sara_data.h | 47 +++++++++++++++++++++++
security/sara/main.c | 6 +++
security/sara/sara_data.c | 79 +++++++++++++++++++++++++++++++++++++++
5 files changed, 136 insertions(+), 1 deletion(-)
create mode 100644 security/sara/include/sara_data.h
create mode 100644 security/sara/sara_data.c
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 099058e..b65b666 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -141,6 +141,9 @@ struct cred {
#ifdef CONFIG_SECURITY
void *security; /* subjective LSM security */
#endif
+#ifdef CONFIG_SECURITY_SARA
+ void *security_sara;
+#endif
struct user_struct *user; /* real user ID subscription */
struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
struct group_info *group_info; /* supplementary groups for euid/fsgid */
diff --git a/security/sara/Makefile b/security/sara/Makefile
index 8acd291..14bf7a8 100644
--- a/security/sara/Makefile
+++ b/security/sara/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_SECURITY_SARA) := sara.o
-sara-y := main.o securityfs.o utils.o
+sara-y := main.o securityfs.o utils.o sara_data.o
diff --git a/security/sara/include/sara_data.h b/security/sara/include/sara_data.h
new file mode 100644
index 0000000..7ed04fd
--- /dev/null
+++ b/security/sara/include/sara_data.h
@@ -0,0 +1,47 @@
+/*
+ * S.A.R.A. Linux Security Module
+ *
+ * Copyright (C) 2017 Salvatore Mesoraca <s.mesoraca16@...il.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __SARA_DATA_H
+#define __SARA_DATA_H
+
+#include <linux/init.h>
+
+int sara_data_init(void) __init;
+
+#ifdef CONFIG_SECURITY_SARA_WXPROT
+
+struct sara_data {
+ unsigned long relro_page;
+ u16 wxp_flags;
+ bool relro_page_found;
+ bool mmap_blocked;
+};
+
+#define get_sara_data_leftvalue(X) ((X)->security_sara)
+#define get_sara_data(X) ((struct sara_data *) (X)->security_sara)
+#define get_current_sara_data() get_sara_data(current_cred())
+
+#define get_sara_wxp_flags(X) (get_sara_data((X))->wxp_flags)
+#define get_current_sara_wxp_flags() get_sara_wxp_flags(current_cred())
+
+#define get_sara_relro_page(X) (get_sara_data((X))->relro_page)
+#define get_current_sara_relro_page() get_sara_relro_page(current_cred())
+
+#define get_sara_relro_page_found(X) (get_sara_data((X))->relro_page_found)
+#define get_current_sara_relro_page_found() \
+ get_sara_relro_page_found(current_cred())
+
+#define get_sara_mmap_blocked(X) (get_sara_data((X))->mmap_blocked)
+#define get_current_sara_mmap_blocked() get_sara_mmap_blocked(current_cred())
+
+#endif
+
+#endif /* __SARA_H */
diff --git a/security/sara/main.c b/security/sara/main.c
index aaddd32..0fc1761 100644
--- a/security/sara/main.c
+++ b/security/sara/main.c
@@ -15,6 +15,7 @@
#include <linux/module.h>
#include "include/sara.h"
+#include "include/sara_data.h"
#include "include/securityfs.h"
static const int sara_version = SARA_VERSION;
@@ -90,6 +91,11 @@ void __init sara_init(void)
goto error;
}
+ if (sara_data_init()) {
+ pr_crit("impossible to initialize creds.\n");
+ goto error;
+ }
+
pr_debug("initialized.\n");
if (sara_enabled)
diff --git a/security/sara/sara_data.c b/security/sara/sara_data.c
new file mode 100644
index 0000000..8f11cd1
--- /dev/null
+++ b/security/sara/sara_data.c
@@ -0,0 +1,79 @@
+/*
+ * S.A.R.A. Linux Security Module
+ *
+ * Copyright (C) 2017 Salvatore Mesoraca <s.mesoraca16@...il.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include "include/sara_data.h"
+
+#ifdef CONFIG_SECURITY_SARA_WXPROT
+#include <linux/cred.h>
+#include <linux/lsm_hooks.h>
+#include <linux/mm.h>
+
+static int sara_cred_alloc_blank(struct cred *cred, gfp_t gfp)
+{
+ struct sara_data *d;
+
+ d = kzalloc(sizeof(*d), gfp);
+ if (d == NULL)
+ return -ENOMEM;
+ get_sara_data_leftvalue(cred) = d;
+ return 0;
+}
+
+static void sara_cred_free(struct cred *cred)
+{
+ struct sara_data *d;
+
+ d = get_sara_data(cred);
+ if (d != NULL) {
+ kfree(d);
+ get_sara_data_leftvalue(cred) = NULL;
+ }
+}
+
+static int sara_cred_prepare(struct cred *new, const struct cred *old,
+ gfp_t gfp)
+{
+ struct sara_data *d;
+
+ d = kmemdup(get_sara_data(old), sizeof(*d), gfp);
+ if (d == NULL)
+ return -ENOMEM;
+ get_sara_data_leftvalue(new) = d;
+ return 0;
+}
+
+static void sara_cred_transfer(struct cred *new, const struct cred *old)
+{
+ *get_sara_data(new) = *get_sara_data(old);
+}
+
+static struct security_hook_list data_hooks[] __ro_after_init = {
+ LSM_HOOK_INIT(cred_alloc_blank, sara_cred_alloc_blank),
+ LSM_HOOK_INIT(cred_free, sara_cred_free),
+ LSM_HOOK_INIT(cred_prepare, sara_cred_prepare),
+ LSM_HOOK_INIT(cred_transfer, sara_cred_transfer),
+};
+
+int __init sara_data_init(void)
+{
+ security_add_hooks(data_hooks, ARRAY_SIZE(data_hooks), "sara");
+ return sara_cred_alloc_blank((struct cred *) current->real_cred,
+ GFP_KERNEL);
+}
+
+#else /* CONFIG_SECURITY_SARA_WXPROT */
+
+int __init sara_data_init(void)
+{
+ return 0;
+}
+
+#endif
--
1.9.1
Powered by blists - more mailing lists