LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Casey Schaufler <casey@schaufler-ca.com>
To: LKML <linux-kernel@vger.kernel.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	dhowells@redhat.com
Cc: jose.bollo@iot.bzh, casey@schaufler-ca.com,
	Linux Security Module list 
	<linux-security-module@vger.kernel.org>
Subject: [PATCH] Smack: Restore the smackfsdef mount option
Date: Mon, 20 May 2019 15:48:03 -0700	[thread overview]
Message-ID: <1ebab7e7-f7ee-b910-9cc8-5d826eee8e97@schaufler-ca.com> (raw)

The 5.1 mount system rework changed the smackfsdef mount option
to smackfsdefault. This fixes the regression by making smackfsdef
treated the same way as smackfsdefault. The change was made in
commit c3300aaf95fb4 from Al Viro.

Reported-by: Jose Bollo <jose.bollo@iot.bzh>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
  security/smack/smack_lsm.c | 2 ++
  1 file changed, 2 insertions(+)

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index b9abcdb36a73..915cf598e164 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -68,6 +68,7 @@ static struct {
  	int len;
  	int opt;
  } smk_mount_opts[] = {
+	{"smackfsdef", sizeof("smackfsdef") - 1, Opt_fsdefault},
  	A(fsdefault), A(fsfloor), A(fshat), A(fsroot), A(fstransmute)
  };
  #undef A
@@ -682,6 +683,7 @@ static int smack_fs_context_dup(struct fs_context *fc,
  }
  
  static const struct fs_parameter_spec smack_param_specs[] = {
+	fsparam_string("fsdef",		Opt_fsdefault),
  	fsparam_string("fsdefault",	Opt_fsdefault),
  	fsparam_string("fsfloor",	Opt_fsfloor),
  	fsparam_string("fshat",		Opt_fshat),


             reply	other threads:[~2019-05-20 22:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20 22:48 Casey Schaufler [this message]
2019-05-21 22:25 ` Casey Schaufler
2019-05-28 12:23 ` David Howells
2019-05-28 15:51   ` Casey Schaufler
2019-05-28 16:22   ` David Howells
2019-05-28 16:41     ` Casey Schaufler
2019-05-28 18:54     ` David Howells
2019-05-28 19:57       ` Casey Schaufler
2019-05-28 20:24         ` Casey Schaufler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1ebab7e7-f7ee-b910-9cc8-5d826eee8e97@schaufler-ca.com \
    --to=casey@schaufler-ca.com \
    --cc=dhowells@redhat.com \
    --cc=jose.bollo@iot.bzh \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    --subject='Re: [PATCH] Smack: Restore the smackfsdef mount option' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).