From patchwork Fri Aug 29 02:47:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 384040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3816F1400BB; Fri, 29 Aug 2014 12:47:16 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XNCDa-0003mI-QS; Fri, 29 Aug 2014 02:47:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XNCDV-0003m3-Lc for fwts-devel@lists.ubuntu.com; Fri, 29 Aug 2014 02:47:09 +0000 Received: from [175.41.48.77] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XNCDV-0004XH-2j; Fri, 29 Aug 2014 02:47:09 +0000 From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] uefirtvariable: fix the wrong operator used, coverity scan error (LP: #1362893) Date: Fri, 29 Aug 2014 10:47:04 +0800 Message-Id: <1409280424-25516-1-git-send-email-ivan.hu@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com CID 1232806, CID1232805: Wrong operator used (CONSTANT_EXPRESSION_RESULT) always true regardless of the values of its operand. Signed-off-by: Ivan Hu Acked-by: Keng-Yu Lin Acked-by: Alex Hung Acked-by: Colin Ian King --- src/uefi/uefirtvariable/uefirtvariable.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c index 46c7f0e..f0fd0ce 100644 --- a/src/uefi/uefirtvariable/uefirtvariable.c +++ b/src/uefi/uefirtvariable/uefirtvariable.c @@ -781,9 +781,9 @@ static int setvariable_insertvariable( if (ioret == -1) { if ((status == EFI_INVALID_PARAMETER) && - ((attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) || - (attributes | FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) || - (attributes | FWTS_UEFI_VARIABLE_APPEND_WRITE))) { + ((attributes & FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) || + (attributes & FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) || + (attributes & FWTS_UEFI_VARIABLE_APPEND_WRITE))) { fwts_uefi_print_status_info(fw, status); fwts_skipped(fw, "EFI_INVALID_PARAMETER shall be returned, " @@ -941,8 +941,8 @@ static int setvariable_invalidattr( ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); if ((status == EFI_SUCCESS) && (ioret != -1)) { - if ((attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) && - (attributes | FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) && + if ((attributes & FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) && + (attributes & FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) && (status != EFI_INVALID_PARAMETER)) { fwts_warning(fw, "Both the EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS attribute and the "