From nobody Sun May 5 14:52:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+92536+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92536+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1660789595; cv=none; d=zohomail.com; s=zohoarc; b=EuCN9Kk+OhwJWCiLfqYsenWbwFoYLOga36lXAWjfn0HAefEv/SqzkCgMDhzn0gbJ+axKSv8IFDIm3ao5foEzAV/F4lBlsNiYJvWhPhPHdWDGeJid8ZwnQyRNOOs4PlNifHaSmRvhQ6z6UeOOVdKmW6DkuNrp1IUjNoTX02UBvGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660789595; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=BP+1W28ebiHfQuPbUk73VvF8YplMyFi0amlkEMVPs3s=; b=cLLBlQfBNAgJojUwdPL1/BLv3209DcgZ773CWWC5zRFfIPYyiMzC6H4zi855/mEDPb/jC8VxvrRXDQY4MXmOhYODGV7xmfVEWp2JtGg8K7tEGPDvwcRxHnvf2dc35YRS8ZX/rm3fqoo6AaEPf9gjZRcP0vwN8nuHBiAjBpgS6mI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92536+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1660789595165280.3028109344958; Wed, 17 Aug 2022 19:26:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 58RQYY1788612xcKSHcbmyKG; Wed, 17 Aug 2022 19:26:34 -0700 X-Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web12.37482.1660789593918621063 for ; Wed, 17 Aug 2022 19:26:34 -0700 X-Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4M7TFV04TNzZfkt; Thu, 18 Aug 2022 10:23:10 +0800 (CST) X-Received: from kwepemm600004.china.huawei.com (7.193.23.242) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 18 Aug 2022 10:26:13 +0800 X-Received: from kwephisprg16640.huawei.com (10.247.83.252) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 18 Aug 2022 10:26:12 +0800 From: "wenyi,xie via groups.io" To: , , , , CC: , Subject: [edk2-devel] [PATCH EDK2 v2 1/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue Date: Thu, 18 Aug 2022 10:26:07 +0800 Message-ID: <20220818022607.2528547-2-xiewenyi2@huawei.com> In-Reply-To: <20220818022607.2528547-1-xiewenyi2@huawei.com> References: <20220818022607.2528547-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xiewenyi2@huawei.com X-Gm-Message-State: jC2z7RwezVvzT2rwA1UPF4fAx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660789594; bh=2dh15D1yf1ZSga7v5BX8J4RsSCsydYGyGpwKVXN/zbQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Dt+kNM9QsN5JCgAcQ1lLmWVSQUx04mGqDnVwN6RKlB/TvLcMXrtyDUMa6kfJ44AFbGc JzAgeizBHWnCQd+vLouGhh5A7XWjaIz05KMTKGR7G4BwSxhR59P1DcuNorBuHBZABeEaG kLSJFkpm1gI4/wDZeRf7tLuLd+h48XTJiAM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660789596215100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When BitPerPixel is 1,4,8, there should be a color map in bmp file. But if the format of bmp file is error, it maybe has no color map when BitPerPixel is 1,4,8. The condition checking now can not catch this issue. Cc: Jian J Wang Cc: Liming Gao Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Wenyi Xie Reviewed-by: Liming Gao --- MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c b/MdeMo= dulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c index c5e885d7a6d5..1cdd857f48f8 100644 --- a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c +++ b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c @@ -236,6 +236,12 @@ TranslateBmpToGopBlt ( return RETURN_UNSUPPORTED; } =20 + if ((BmpHeader->ImageOffset =3D=3D sizeof (BMP_IMAGE_HEADER)) && + ((BmpHeader->BitPerPixel & 0x0D) !=3D 0)) + { + return RETURN_UNSUPPORTED; + } + if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) { switch (BmpHeader->BitPerPixel) { case 1: --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92536): https://edk2.groups.io/g/devel/message/92536 Mute This Topic: https://groups.io/mt/93096647/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-