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

Commit 65c23c65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "A small set of cifs fixes.

  I am still reviewing some more, recently submitted SMB3 fixes, but
  these three are small and safe and ready now"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix erroneous return value
  cifs: fix potential overflow in cifs_compose_mount_options
  cifs: remove redundant check for null string pointer
parents d82834ee 4b550af5

fs/cifs/cifs_dfs_ref.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, 
	 * string to the length of the original string to allow for worst case.

	 */

	md_len = strlen(sb_mountdata) + INET6_ADDRSTRLEN;

	mountdata = kzalloc(md_len + 1, GFP_KERNEL);

	mountdata = kzalloc(md_len + sizeof("ip=") + 1, GFP_KERNEL);

	if (mountdata == NULL) {

		rc = -ENOMEM;

		goto compose_mount_options_err;

fs/cifs/cifsencrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) 


	ses->auth_key.response = kmalloc(baselen + tilen, GFP_KERNEL);

	if (!ses->auth_key.response) {

		rc = ENOMEM;

		rc = -ENOMEM;

		ses->auth_key.len = 0;

		goto setup_ntlmv2_rsp_ret;

	}

fs/cifs/connect.c

+1 −2
Original line number Diff line number Diff line
@@ -2999,8 +2999,7 @@ ip_rfc1001_connect(struct TCP_Server_Info *server) 
	if (ses_init_buf) {

		ses_init_buf->trailer.session_req.called_len = 32;



		if (server->server_RFC1001_name &&

		    server->server_RFC1001_name[0] != 0)

		if (server->server_RFC1001_name[0] != 0)

			rfc1002mangle(ses_init_buf->trailer.

				      session_req.called_name,

				      server->server_RFC1001_name,