From: Shyam Prasad N <sprasad@microsoft.com>

Date: Sat, 6 Nov 2021 11:31:53 +0000

Subject: [PATCH] cifs: nosharesock should not share socket with future

 sessions

Git-commit: c9f1c19cf7c50949885fa5afdb2cb242d61a7fac

Patch-mainline: v5.16-rc1

References: bsc#1192606

Today, when a new mount is done with nosharesock, we ensure

that we don't select an existing matching session. However,

we don't mark the connection as nosharesock, which means that

those could be shared with future sessions.

Fixed it with this commit. Also printing this info in DebugData.

Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>

Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>

Signed-off-by: Steve French <stfrench@microsoft.com>

Acked-by: Enzo Matsumiya <ematsumiya@suse.de>

---

 fs/cifs/cifs_debug.c | 2 ++

 fs/cifs/cifsglob.h   | 1 +

 fs/cifs/connect.c    | 8 +++++++-

 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c

index de2c12bcfa4b..905a901f7f80 100644

--- a/fs/cifs/cifs_debug.c

+++ b/fs/cifs/cifs_debug.c

@@ -358,6 +358,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)

 			seq_printf(m, " signed");

 		if (server->posix_ext_supported)

 			seq_printf(m, " posix");

+		if (server->nosharesock)

+			seq_printf(m, " nosharesock");

 		if (server->rdma)

 			seq_printf(m, "\nRDMA ");

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h

index abff31dcd005..eeea520ede0a 100644

--- a/fs/cifs/cifsglob.h

+++ b/fs/cifs/cifsglob.h

@@ -592,6 +592,7 @@ struct TCP_Server_Info {

 	struct list_head pending_mid_q;

 	bool noblocksnd;		/* use blocking sendmsg */

 	bool noautotune;		/* do not autotune send buf sizes */

+	bool nosharesock;

 	bool tcp_nodelay;

 	unsigned int credits;  /* send no more requests at once */

 	unsigned int max_credits; /* can override large 32000 default at mnt */

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c

index 0abbff4e4135..24742b7402d1 100644

--- a/fs/cifs/connect.c

+++ b/fs/cifs/connect.c

@@ -1217,7 +1217,13 @@ static int match_server(struct TCP_Server_Info *server, struct smb3_fs_context *

 {

 	struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr;

-	if (ctx->nosharesock)

+	if (ctx->nosharesock) {

+		server->nosharesock = true;

+		return 0;

+	}

+

+	/* this server does not share socket */

+	if (server->nosharesock)

 		return 0;

 	/* If multidialect negotiation see if existing sessions match one */

-- 

2.33.1