Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de47a417 authored by Shirish Pargaonkar's avatar Shirish Pargaonkar Committed by Steve French
Browse files

cifs: Fix oops in session setup code for null user mounts 



For null user mounts, do not invoke string length function
during session setup.

Cc: <stable@kernel.org
Reported-and-Tested-by: default avatarChris Clayton <chris2553@googlemail.com>
Acked-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 2a73ca82

fs/cifs/sess.c

+3 −4
Original line number Diff line number Diff line
@@ -246,16 +246,15 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses, 
	/* copy user */

	/* BB what about null user mounts - check that we do this BB */

	/* copy user */

	if (ses->user_name != NULL)

	if (ses->user_name != NULL) {

		strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE);

	/* else null user mount */



		bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);

	}

	/* else null user mount */

	*bcc_ptr = 0;

	bcc_ptr++; /* account for null termination */



	/* copy domain */



	if (ses->domainName != NULL) {

		strncpy(bcc_ptr, ses->domainName, 256);

		bcc_ptr += strnlen(ses->domainName, 256);