diff options
| author |   Don Dugger <donald.d.dugger@intel.com> | 2015-10-29 22:15:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-29 22:15:25 +0000 |
| commit | afc76d554ed517e38d46b6b182a7016406a1323f (patch) | |
| tree | 06133cb33a43488837ea67667458e1582f2f40ce /kernel/security | |
| parent | 41f827bfbb10e03c4d228fbcc801dd51fb9983b0 (diff) | |
| parent | ec0a2ed6d8a5e555edef907895c041e285fdb495 (diff) | |
Merge "These changes are a raw update to a vanilla kernel 4.1.10, with the recently announced rt patch patch-4.1.10-rt10.patch. No further changes needed."
Diffstat (limited to 'kernel/security')
| -rw-r--r-- | kernel/security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/security/selinux/hooks.c b/kernel/security/selinux/hooks.c index 7f8d7f19e..280235cc3 100644 --- a/kernel/security/selinux/hooks.c +++ b/kernel/security/selinux/hooks.c @@ -1095,7 +1095,7 @@ static void selinux_write_opts(struct seq_file *m, seq_puts(m, prefix); if (has_comma) seq_putc(m, '\"'); - seq_puts(m, opts->mnt_opts[i]); + seq_escape(m, opts->mnt_opts[i], "\"\n\\"); if (has_comma) seq_putc(m, '\"'); } |