diff mbox series

[5.5,66/80] cifs: fix mount option display for sec=krb5i

Message ID	20200218190438.315043569@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=OEC5=4G=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Petr Pavlu <petr.pavlu@suse.com>, Steve French <stfrench@microsoft.com> Subject: [PATCH 5.5 66/80] cifs: fix mount option display for sec=krb5i Date: Tue, 18 Feb 2020 20:55:27 +0100 Message-Id: <20200218190438.315043569@linuxfoundation.org> In-Reply-To: <20200218190432.043414522@linuxfoundation.org> References: <20200218190432.043414522@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,05/80] Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list [5.5,08/80] ALSA: pcm: Fix double hw_free calls [5.5,09/80] ALSA: hda/realtek - Add more codec supported Headset Button [5.5,11/80] ALSA: usb-audio: Apply sample rate quirk for Audioengine D1 [5.5,13/80] ACPI: PM: s2idle: Avoid possible race related to the EC GPE [5.5,14/80] ACPICA: Introduce acpi_any_gpe_status_set() [5.5,15/80] ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system [5.5,19/80] ext4: add cond_resched() to ext4_protect_reserved_inode [5.5,20/80] ext4: improve explanation of a mount failure caused by a misconfigured kernel [5.5,22/80] btrfs: ref-verify: fix memory leaks [5.5,24/80] btrfs: log message when rw remount is attempted with unclean tree-log [5.5,26/80] gpio: xilinx: Fix bug where the wrong GPIO register is written to [5.5,27/80] arm64: ssbs: Fix context-switch when SSBS is present on all CPUs [5.5,29/80] xprtrdma: Fix DMA scatter-gather list mapping imbalance [5.5,30/80] cifs: make sure we do not overflow the max EA buffer size [5.5,32/80] jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer [5.5,33/80] EDAC/sysfs: Remove csrow objects on errors [5.5,35/80] KVM: nVMX: Use correct root level for nested EPT shadow page tables [5.5,38/80] s390/pkey: fix missing length of protected key on return [5.5,41/80] drm/mst: Fix possible NULL pointer dereference in drm_dp_mst_process_up_req() [5.5,42/80] drm/panfrost: Make sure the shrinker does not reclaim referenced BOs [5.5,43/80] drm/amdgpu: update smu_v11_0_pptable.h [5.5,46/80] nvme: fix the parameter order for nvme_get_log in nvme_get_fw_slot_info [5.5,48/80] IB/mlx5: Return failure when rts2rts_qp_counters_set_id is not supported [5.5,50/80] IB/hfi1: Close window for pq and request coliding [5.5,52/80] IB/umad: Fix kernel crash while unloading ib_umad [5.5,53/80] RDMA/core: Fix invalid memory access in spec_filter_size [5.5,56/80] RDMA/rxe: Fix soft lockup problem due to using tasklets in softirq [5.5,57/80] RDMA/core: Fix protection fault in get_pkey_idx_qp_list [5.5,59/80] Input: ili210x - fix return value of is_visible function [5.5,63/80] perf/x86/intel: Fix inaccurate period in context switch for auto-reload [5.5,65/80] mac80211: fix quiet mode activation in action frames [5.5,66/80] cifs: fix mount option display for sec=krb5i [5.5,69/80] KVM: x86: Mask off reserved bit from #DB exception payload [5.5,70/80] KVM: nVMX: Handle pending #DB when injecting INIT VM-exit [5.5,71/80] perf stat: Dont report a null stalled cycles per insn metric [5.5,74/80] Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config" [5.5,76/80] ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project() [5.5,77/80] io-wq: add support for inheriting ->fs [5.5,80/80] mmc: core: Rework wp-gpio handling

Commit Message

Greg Kroah-Hartman Feb. 18, 2020, 7:55 p.m. UTC

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(-)

diff mbox series

Patch

--- 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