Commit b076173a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull selinux fixes from Paul Moore:
 "Three patches for v5.2.

  One fixes a problem where we weren't correctly logging raw SELinux
  labels, the other two fix problems where we weren't properly checking
  calls to kmemdup()"

* tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: fix a missing-check bug in selinux_sb_eat_lsm_opts()
  selinux: fix a missing-check bug in selinux_add_mnt_opt( )
  selinux: log raw contexts as untrusted strings
parents 35110e38 fec63753
...@@ -739,14 +739,20 @@ static void avc_audit_post_callback(struct audit_buffer *ab, void *a) ...@@ -739,14 +739,20 @@ static void avc_audit_post_callback(struct audit_buffer *ab, void *a)
rc = security_sid_to_context_inval(sad->state, sad->ssid, &scontext, rc = security_sid_to_context_inval(sad->state, sad->ssid, &scontext,
&scontext_len); &scontext_len);
if (!rc && scontext) { if (!rc && scontext) {
audit_log_format(ab, " srawcon=%s", scontext); if (scontext_len && scontext[scontext_len - 1] == '\0')
scontext_len--;
audit_log_format(ab, " srawcon=");
audit_log_n_untrustedstring(ab, scontext, scontext_len);
kfree(scontext); kfree(scontext);
} }
rc = security_sid_to_context_inval(sad->state, sad->tsid, &scontext, rc = security_sid_to_context_inval(sad->state, sad->tsid, &scontext,
&scontext_len); &scontext_len);
if (!rc && scontext) { if (!rc && scontext) {
audit_log_format(ab, " trawcon=%s", scontext); if (scontext_len && scontext[scontext_len - 1] == '\0')
scontext_len--;
audit_log_format(ab, " trawcon=");
audit_log_n_untrustedstring(ab, scontext, scontext_len);
kfree(scontext); kfree(scontext);
} }
} }
......
...@@ -1052,15 +1052,24 @@ static int selinux_add_mnt_opt(const char *option, const char *val, int len, ...@@ -1052,15 +1052,24 @@ static int selinux_add_mnt_opt(const char *option, const char *val, int len,
if (token == Opt_error) if (token == Opt_error)
return -EINVAL; return -EINVAL;
if (token != Opt_seclabel) if (token != Opt_seclabel) {
val = kmemdup_nul(val, len, GFP_KERNEL); val = kmemdup_nul(val, len, GFP_KERNEL);
if (!val) {
rc = -ENOMEM;
goto free_opt;
}
}
rc = selinux_add_opt(token, val, mnt_opts); rc = selinux_add_opt(token, val, mnt_opts);
if (unlikely(rc)) { if (unlikely(rc)) {
kfree(val); kfree(val);
if (*mnt_opts) { goto free_opt;
selinux_free_mnt_opts(*mnt_opts); }
*mnt_opts = NULL; return rc;
}
free_opt:
if (*mnt_opts) {
selinux_free_mnt_opts(*mnt_opts);
*mnt_opts = NULL;
} }
return rc; return rc;
} }
...@@ -2616,10 +2625,11 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) ...@@ -2616,10 +2625,11 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
char *from = options; char *from = options;
char *to = options; char *to = options;
bool first = true; bool first = true;
int rc;
while (1) { while (1) {
int len = opt_len(from); int len = opt_len(from);
int token, rc; int token;
char *arg = NULL; char *arg = NULL;
token = match_opt_prefix(from, len, &arg); token = match_opt_prefix(from, len, &arg);
...@@ -2635,15 +2645,15 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) ...@@ -2635,15 +2645,15 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
*q++ = c; *q++ = c;
} }
arg = kmemdup_nul(arg, q - arg, GFP_KERNEL); arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
if (!arg) {
rc = -ENOMEM;
goto free_opt;
}
} }
rc = selinux_add_opt(token, arg, mnt_opts); rc = selinux_add_opt(token, arg, mnt_opts);
if (unlikely(rc)) { if (unlikely(rc)) {
kfree(arg); kfree(arg);
if (*mnt_opts) { goto free_opt;
selinux_free_mnt_opts(*mnt_opts);
*mnt_opts = NULL;
}
return rc;
} }
} else { } else {
if (!first) { // copy with preceding comma if (!first) { // copy with preceding comma
...@@ -2661,6 +2671,13 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) ...@@ -2661,6 +2671,13 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
} }
*to = '\0'; *to = '\0';
return 0; return 0;
free_opt:
if (*mnt_opts) {
selinux_free_mnt_opts(*mnt_opts);
*mnt_opts = NULL;
}
return rc;
} }
static int selinux_sb_remount(struct super_block *sb, void *mnt_opts) static int selinux_sb_remount(struct super_block *sb, void *mnt_opts)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment