selinux: fix double free in selinux_parse_opts_str()
authorPaul Moore <>
Wed, 7 Jun 2017 20:48:19 +0000 (16:48 -0400)
committerBen Hutchings <>
Fri, 15 Sep 2017 17:30:53 +0000 (18:30 +0100)
commit 023f108dcc187e34ef864bf10ed966cf25e14e2a upstream.

This patch is based on a discussion generated by an earlier patch
from Tetsuo Handa:


The double free problem involves the mnt_opts field of the
security_mnt_opts struct, selinux_parse_opts_str() frees the memory
on error, but doesn't set the field to NULL so if the caller later
attempts to call security_free_mnt_opts() we trigger the problem.

In order to play it safe we change selinux_parse_opts_str() to call
security_free_mnt_opts() on error instead of free'ing the memory
directly.  This should ensure that everything is handled correctly,
regardless of what the caller may do.

Fixes: e0007529893c1c06 ("LSM/SELinux: Interfaces to allow FS to control mount options")
Cc: Tetsuo Handa <>
Reported-by: Dmitry Vyukov <>
Signed-off-by: Paul Moore <>
Signed-off-by: James Morris <>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <>

index c279f2f..4c6a347 100644 (file)
@@ -911,10 +911,8 @@ static int selinux_parse_opts_str(char *options,
                goto out_err;
        opts->mnt_opts_flags = kcalloc(NUM_SEL_MNT_OPTS, sizeof(int), GFP_ATOMIC);
-       if (!opts->mnt_opts_flags) {
-               kfree(opts->mnt_opts);
+       if (!opts->mnt_opts_flags)
                goto out_err;
-       }
        if (fscontext) {
                opts->mnt_opts[num_mnt_opts] = fscontext;
@@ -937,6 +935,7 @@ static int selinux_parse_opts_str(char *options,
        return 0;
+       security_free_mnt_opts(opts);