[S] Change in coreboot[master]: UPSTREAM: security/vboot: Fix different size operands in bitwise oper...

[Shahina Shaik (Code Review)]

Attention is currently required from: Julius Werner, Yu-Ping Wu.

Shahina Shaik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69221 )

Change subject: UPSTREAM: security/vboot: Fix different size operands in bitwise operation
......................................................................

UPSTREAM: security/vboot: Fix different size operands in bitwise operation

Handle operands of different size in bitwise operation

Foundby=klocwork
BUG=NONE
TEST=Boot to OS on Nivviks

Change-Id: Ifecd5de843bd0229c0cab758d4a641889b4bffd6
Signed-off-by: Shaik Shahina 
---
M src/security/vboot/vboot_common.c
1 file changed, 19 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/69221/1

diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index c557f25..1577f75 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -15,20 +15,20 @@
    		(CONFIG(VBOOT_MOCK_SECDATA) || tlcl_lib_init() == VB2_SUCCESS)) {
    	printk(BIOS_INFO, "Saving secdata firmware\n");
    	antirollback_write_space_firmware(ctx);
-		ctx->flags &= ~VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED;
+		ctx->flags &= (uint64_t)(~VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED);
    }

if (ctx->flags & VB2_CONTEXT_SECDATA_KERNEL_CHANGED &&
    		(CONFIG(VBOOT_MOCK_SECDATA) || tlcl_lib_init() == VB2_SUCCESS)) {
    	printk(BIOS_INFO, "Saving secdata kernel\n");
    	antirollback_write_space_kernel(ctx);
-		ctx->flags &= ~VB2_CONTEXT_SECDATA_KERNEL_CHANGED;
+		ctx->flags &= (uint64_t)(~VB2_CONTEXT_SECDATA_KERNEL_CHANGED);
    }

if (ctx->flags & VB2_CONTEXT_NVDATA_CHANGED) {
    	printk(BIOS_INFO, "Saving nvdata\n");
    	save_vbnv(ctx->nvdata);
-		ctx->flags &= ~VB2_CONTEXT_NVDATA_CHANGED;
+		ctx->flags &= (uint64_t)(~VB2_CONTEXT_NVDATA_CHANGED);
    }
 }