On Thu, Dec 8, 2016 at 3:03 AM, Sachin Prabhu <sprabhu@xxxxxxxxxx> wrote: > On Thu, 2016-12-08 at 02:06 -0600, Scott Lovenberg wrote: >> On Thu, Dec 8, 2016 at 12:46 AM, Sachin Prabhu <sprabhu@xxxxxxxxxx> >> wrote: >> > >> > If the security type specified using a mount option is not >> > supported, >> > the SMB2 session setup code changes the security type to >> > RawNTLMSSP. We >> > should instead fail the mount and return an error. >> > >> > Signed-off-by: Sachin Prabhu <sprabhu@xxxxxxxxxx> >> > --- >> > fs/cifs/smb2pdu.c | 3 ++- >> > 1 file changed, 2 insertions(+), 1 deletion(-) >> > >> > diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c >> > index 5ca5ea46..e66fad6 100644 >> > --- a/fs/cifs/smb2pdu.c >> > +++ b/fs/cifs/smb2pdu.c >> > @@ -955,7 +955,8 @@ SMB2_sess_auth_rawntlmssp_authenticate(struct >> > SMB2_sess_data *sess_data) >> > static int >> > SMB2_select_sec(struct cifs_ses *ses, struct SMB2_sess_data >> > *sess_data) >> > { >> > - if (ses->sectype != Kerberos && ses->sectype != RawNTLMSSP) >> > + /* Default sec type is set to RawNTLMSSP */ >> > + if (ses->sectype == Unspecified) >> > ses->sectype = RawNTLMSSP; >> > >> > switch (ses->sectype) { >> > -- >> > 2.7.4 >> > >> > -- >> >> My initial reaction was "allow the SSP to do its thing". However, >> after some consideration, this is a much better way to handle this >> exceptional case when a user gives an explicit security type and it >> cannot be honored. +1, FWIW >> My only concern is, "will this be considered a regression by users >> that have (unknowingly) relied upon the previous behavior?" >> > That is a valid concern which could trip up users who have been using > an incorrect mount option. However in my opinion it would be better to > reject mounts in case where the mount options requested are not > available instead of silently switching the mount options and ending up > with behaviour which wasn't expected by the user. > > Sachin Prabhu Perhaps a reasonable middle ground would be logging so it fails less silently? I'm not sure that average users would think to check the kernel log though, so it might be a moot point. Either way, the ends justify the means here IMHO. -- Peace and Blessings, -Scott. -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html