* [PATCH] CIFS: Fix some return values in case of error in 'crypt_message'
@ 2017-06-11 7:12 Christophe JAILLET
2017-06-12 15:56 ` Aurélien Aptel
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christophe JAILLET @ 2017-06-11 7:12 UTC (permalink / raw)
To: sfrench
Cc: linux-cifs, samba-technical, linux-kernel, kernel-janitors,
Christophe JAILLET
'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: 026e93dc0a3ee ("CIFS: Encrypt SMB3 requests before sending")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
fs/cifs/smb2ops.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index c58691834eb2..cdcb3d95add8 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -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;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] CIFS: Fix some return values in case of error in 'crypt_message'
2017-06-11 7:12 [PATCH] CIFS: Fix some return values in case of error in 'crypt_message' Christophe JAILLET
@ 2017-06-12 15:56 ` Aurélien Aptel
2017-06-12 23:12 ` Pavel Shilovskiy
2017-06-21 17:01 ` Steve French
2 siblings, 0 replies; 4+ messages in thread
From: Aurélien Aptel @ 2017-06-12 15:56 UTC (permalink / raw)
To: Christophe JAILLET, sfrench
Cc: linux-cifs, samba-technical, linux-kernel, kernel-janitors,
Christophe JAILLET
Looks good to me.
--
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3
SUSE Linux GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] CIFS: Fix some return values in case of error in 'crypt_message'
2017-06-11 7:12 [PATCH] CIFS: Fix some return values in case of error in 'crypt_message' Christophe JAILLET
2017-06-12 15:56 ` Aurélien Aptel
@ 2017-06-12 23:12 ` Pavel Shilovskiy
2017-06-21 17:01 ` Steve French
2 siblings, 0 replies; 4+ messages in thread
From: Pavel Shilovskiy @ 2017-06-12 23:12 UTC (permalink / raw)
To: Christophe JAILLET, sfrench
Cc: linux-cifs, samba-technical, linux-kernel, kernel-janitors
2017-06-11 0:12 GMT-07:00 Christophe JAILLET <christophe.jaillet@wanadoo.fr>:
> '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: 026e93dc0a3ee ("CIFS: Encrypt SMB3 requests before sending")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> fs/cifs/smb2ops.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index c58691834eb2..cdcb3d95add8 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -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;
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks for catching this.
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
--
Best regards,
Pavel Shilovsky
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] CIFS: Fix some return values in case of error in 'crypt_message'
2017-06-11 7:12 [PATCH] CIFS: Fix some return values in case of error in 'crypt_message' Christophe JAILLET
2017-06-12 15:56 ` Aurélien Aptel
2017-06-12 23:12 ` Pavel Shilovskiy
@ 2017-06-21 17:01 ` Steve French
2 siblings, 0 replies; 4+ messages in thread
From: Steve French @ 2017-06-21 17:01 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Steve French, linux-cifs, samba-technical, LKML, kernel-janitors
merged into cifs-2.6.git for-next
On Sun, Jun 11, 2017 at 2:12 AM, Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
> '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: 026e93dc0a3ee ("CIFS: Encrypt SMB3 requests before sending")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> fs/cifs/smb2ops.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index c58691834eb2..cdcb3d95add8 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -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;
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-21 17:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-11 7:12 [PATCH] CIFS: Fix some return values in case of error in 'crypt_message' Christophe JAILLET
2017-06-12 15:56 ` Aurélien Aptel
2017-06-12 23:12 ` Pavel Shilovskiy
2017-06-21 17:01 ` Steve French
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).