Commit 517a6e43 authored Jun 11, 2017 by Christophe Jaillet Committed by Steve French Jun 21, 2017

CIFS: Fix some return values in case of error in 'crypt_message'



'rc' is known to be 0 at this point. So if 'init_sg' or 'kzalloc' fails, we
should return -ENOMEM instead.

Also remove a useless 'rc' in a debug message as it is meaningless here.

Fixes: 026e93dc ("CIFS: Encrypt SMB3 requests before sending")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <smfrench@gmail.com>
CC: Stable <stable@vger.kernel.org>

parent e125f528

fs/cifs/smb2ops.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1809,7 +1809,8 @@ crypt_message(struct TCP_Server_Info server, struct smb_rqst rqst, int enc)

		sg = init_sg(rqst, sign);
		if (!sg) {
		cifs_dbg(VFS, "%s: Failed to init sg %d", __func__, rc);
		cifs_dbg(VFS, "%s: Failed to init sg", __func__);
		rc = -ENOMEM;
		goto free_req;
		}

		@@ -1817,6 +1818,7 @@ crypt_message(struct TCP_Server_Info server, struct smb_rqst rqst, int enc)
		iv = kzalloc(iv_len, GFP_KERNEL);
		if (!iv) {
		cifs_dbg(VFS, "%s: Failed to alloc IV", __func__);
		rc = -ENOMEM;
		goto free_sg;
		}
		iv[0] = 3;

Admin message