diff mbox

[cifs-next] cifs: set oparms.create_options rather than or'ing in CREATE_OPEN_BACKUP_INTENT

Message ID 20170705124734.12816-1-colin.king@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Colin King July 5, 2017, 12:47 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Currently oparms.create_options is uninitialized and the code is logically
or'ing in CREATE_OPEN_BACKUP_INTENT onto a garbage value of
oparms.create_options from the stack.  Fix this by just setting the value
rather than or'ing in the setting.

Detected by CoverityScan, CID#1447220 ("Unitialized scale value")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 fs/cifs/smb2ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pavel Shilovskiy July 6, 2017, 1:01 a.m. UTC | #1 
2017-07-05 5:47 GMT-07:00 Colin King <colin.king@canonical.com>:
> From: Colin Ian King <colin.king@canonical.com>

>

> Currently oparms.create_options is uninitialized and the code is logically

> or'ing in CREATE_OPEN_BACKUP_INTENT onto a garbage value of

> oparms.create_options from the stack.  Fix this by just setting the value

> rather than or'ing in the setting.

>

> Detected by CoverityScan, CID#1447220 ("Unitialized scale value")

>

> Signed-off-by: Colin Ian King <colin.king@canonical.com>

> ---

>  fs/cifs/smb2ops.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c

> index 941c40b7a870..c805b7619083 100644

> --- a/fs/cifs/smb2ops.c

> +++ b/fs/cifs/smb2ops.c

> @@ -1339,7 +1339,7 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,

>         xid = get_xid();

>

>         if (backup_cred(cifs_sb))

> -               oparms.create_options |= CREATE_OPEN_BACKUP_INTENT;

> +               oparms.create_options = CREATE_OPEN_BACKUP_INTENT;

>         else

>                 oparms.create_options = 0;

>



Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>


--
Best regards,
Pavel Shilovsky
Steve French July 6, 2017, 1:02 a.m. UTC | #2 
good catch - merged into cifs-2.6.git for-next

On Wed, Jul 5, 2017 at 7:47 AM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently oparms.create_options is uninitialized and the code is logically
> or'ing in CREATE_OPEN_BACKUP_INTENT onto a garbage value of
> oparms.create_options from the stack.  Fix this by just setting the value
> rather than or'ing in the setting.
>
> Detected by CoverityScan, CID#1447220 ("Unitialized scale value")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  fs/cifs/smb2ops.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index 941c40b7a870..c805b7619083 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -1339,7 +1339,7 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,
>         xid = get_xid();
>
>         if (backup_cred(cifs_sb))
> -               oparms.create_options |= CREATE_OPEN_BACKUP_INTENT;
> +               oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
>         else
>                 oparms.create_options = 0;
>
> --
> 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
diff mbox

Patch

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 941c40b7a870..c805b7619083 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -1339,7 +1339,7 @@  get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,
 	xid = get_xid();
 
 	if (backup_cred(cifs_sb))
-		oparms.create_options |= CREATE_OPEN_BACKUP_INTENT;
+		oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
 	else
 		oparms.create_options = 0;