lkml.org 
[lkml]   [2020]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 55/66] cifs: fix mount option display for sec=krb5i
    Date
    From: Petr Pavlu <petr.pavlu@suse.com>

    commit 3f6166aaf19902f2f3124b5426405e292e8974dd upstream.

    Fix display for sec=krb5i which was wrongly interleaved by cruid,
    resulting in string "sec=krb5,cruid=<...>i" instead of
    "sec=krb5i,cruid=<...>".

    Fixes: 96281b9e46eb ("smb3: for kerberos mounts display the credential uid used")
    Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
    Signed-off-by: Steve French <stfrench@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cifs/cifsfs.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/fs/cifs/cifsfs.c
    +++ b/fs/cifs/cifsfs.c
    @@ -414,7 +414,7 @@ cifs_show_security(struct seq_file *s, s
    seq_puts(s, "ntlm");
    break;
    case Kerberos:
    - seq_printf(s, "krb5,cruid=%u", from_kuid_munged(&init_user_ns,ses->cred_uid));
    + seq_puts(s, "krb5");
    break;
    case RawNTLMSSP:
    seq_puts(s, "ntlmssp");
    @@ -427,6 +427,10 @@ cifs_show_security(struct seq_file *s, s

    if (ses->sign)
    seq_puts(s, "i");
    +
    + if (ses->sectype == Kerberos)
    + seq_printf(s, ",cruid=%u",
    + from_kuid_munged(&init_user_ns, ses->cred_uid));
    }

    static void

    \
     
     \ /
      Last update: 2020-02-18 21:01    [W:6.024 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site