[CIFS] Make warning when using default version (default mount) less noisy
diff mbox series

Message ID CAH2r5msKRKFdpg16DE-HvEGDDMZQOw2=nhL3xbBJoYEvyzHwnQ@mail.gmail.com
State New
Headers show
Series
  • [CIFS] Make warning when using default version (default mount) less noisy
Related show

Commit Message

Steve French March 5, 2020, 6:03 a.m. UTC
The warning we print on mount about how to use less secure dialects
    (when the user does not specify a version on mount) is useful
    but is noisy to print on every default mount, and can be changed
    to a warn_once.  Slightly updated the warning text as well to note
    SMB3.1.1 which has been the default which is typically negotiated
    (for a few years now) by most servers.

          "No dialect specified on mount. Default has changed to a more
           secure dialect, SMB2.1 or later (e.g. SMB3.1.1), from CIFS
           (SMB1). To use the less secure SMB1 dialect to access old
           servers which do not support SMB3.1.1 (or even SMB3 or SMB2.1)
           specify vers=1.0 on mount."

Comments

ronnie sahlberg March 5, 2020, 6:14 a.m. UTC | #1
Acked-by me


On Thu, Mar 5, 2020 at 4:03 PM Steve French <smfrench@gmail.com> wrote:
>
>     The warning we print on mount about how to use less secure dialects
>     (when the user does not specify a version on mount) is useful
>     but is noisy to print on every default mount, and can be changed
>     to a warn_once.  Slightly updated the warning text as well to note
>     SMB3.1.1 which has been the default which is typically negotiated
>     (for a few years now) by most servers.
>
>           "No dialect specified on mount. Default has changed to a more
>            secure dialect, SMB2.1 or later (e.g. SMB3.1.1), from CIFS
>            (SMB1). To use the less secure SMB1 dialect to access old
>            servers which do not support SMB3.1.1 (or even SMB3 or SMB2.1)
>            specify vers=1.0 on mount."
>
>
> --
> Thanks,
>
> Steve

Patch
diff mbox series

From b37d411f74677f9c5ba3fc2aef152cd66b51e85d Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Wed, 4 Mar 2020 23:56:52 -0600
Subject: [PATCH] CIFS: Warn less noisily on default mount

The warning we print on mount about how to use less secure dialects
(when the user does not specify a version on mount) is useful
but is noisy to print on every default mount, and can be changed
to a warn_once.  Slightly updated the warning text as well to note
SMB3.1.1 which has been the default which is typically negotiated
(for a few years now) by most servers.

      "No dialect specified on mount. Default has changed to a more
       secure dialect, SMB2.1 or later (e.g. SMB3.1.1), from CIFS
       (SMB1). To use the less secure SMB1 dialect to access old
       servers which do not support SMB3.1.1 (or even SMB3 or SMB2.1)
       specify vers=1.0 on mount."

Signed-off-by: Steve French <stfrench@microsoft.com>
---
 fs/cifs/connect.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 46b602dfc4d3..25262446b222 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2469,11 +2469,12 @@  cifs_parse_mount_options(const char *mountdata, const char *devname,
 		pr_notice("CIFS: ignoring forcegid mount option specified with no gid= option.\n");
 
 	if (got_version == false)
-		pr_warn("No dialect specified on mount. Default has changed to "
-			"a more secure dialect, SMB2.1 or later (e.g. SMB3), from CIFS "
-			"(SMB1). To use the less secure SMB1 dialect to access "
-			"old servers which do not support SMB3 (or SMB2.1) specify vers=1.0"
-			" on mount.\n");
+		pr_warn_once("No dialect specified on mount. Default has changed"
+			" to a more secure dialect, SMB2.1 or later (e.g. "
+			"SMB3.1.1), from CIFS (SMB1). To use the less secure "
+			"SMB1 dialect to access old servers which do not "
+			"support SMB3.1.1 (or even SMB3 or SMB2.1) specify "
+			"vers=1.0 on mount.\n");
 
 	kfree(mountdata_copy);
 	return 0;
-- 
2.20.1