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

Commit d8e2f53a authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: fix error handling in parse_DFS_referrals 



cifs_strndup_from_ucs returns NULL on error, not an ERR_PTR

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 45d44740

fs/cifs/cifssmb.c

+4 −8
Original line number Diff line number Diff line
@@ -3976,9 +3976,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, 
		max_len = data_end - temp;

		node->path_name = cifs_strndup_from_ucs(temp, max_len,

						      is_unicode, nls_codepage);

		if (IS_ERR(node->path_name)) {

			rc = PTR_ERR(node->path_name);

			node->path_name = NULL;

		if (!node->path_name) {

			rc = -ENOMEM;

			goto parse_DFS_referrals_exit;

		}
@@ -3987,11 +3986,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, 
		max_len = data_end - temp;

		node->node_name = cifs_strndup_from_ucs(temp, max_len,

						      is_unicode, nls_codepage);

		if (IS_ERR(node->node_name)) {

			rc = PTR_ERR(node->node_name);

			node->node_name = NULL;

			goto parse_DFS_referrals_exit;

		}

		if (!node->node_name)

			rc = -ENOMEM;

	}



parse_DFS_referrals_exit: