From nobody Sat May 4 09:45:17 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+97501+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+97501+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1671184270; cv=none; d=zohomail.com; s=zohoarc; b=kjPIDWqs8VUwBBBEywVA+FU6QS8kX35PfX/scTfrv6GQuLhPySC9RtBVFfCZP26hhLpqp3bmio0uny1p8NQaVdBpNETC7rpYiHpFn7eQJ+EYf2ToXng7LgcyWGooSiy0YsegxAz27w4FxfW2DJsg91LacI0OtM4yVq+YumZxzAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671184270; 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=ChtnmX73DPaUhSeDGb7tMKpbWVVohptbNljUbZqGlDc=; b=HbutoX7gPOL48z3i5wAbiz218Mp2XoPrUMn2lfMrO3mAmyi9auZ5BwQc9fF7sHtz13JG7VmHP8jv8LFWToXN0bl3jobPDzIZaQyUNFwn4tizehwUE4AWpbclTgR7rX6NBhnM5gjmffh9NoXAP9QGCPWIIUGB3KuKZ27RkL2qVrs= 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+97501+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1671184270232246.01853202570226; Fri, 16 Dec 2022 01:51:10 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id a0F8YY1788612x0ytxXEmVPC; Fri, 16 Dec 2022 01:51:09 -0800 X-Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web11.9481.1671184268598814956 for ; Fri, 16 Dec 2022 01:51:08 -0800 X-Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NYPTm3W62zmWh7; Fri, 16 Dec 2022 17:50:04 +0800 (CST) 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.34; Fri, 16 Dec 2022 17:51:05 +0800 From: "wenyi,xie via groups.io" To: , , , , CC: , Subject: [edk2-devel] [PATCH EDK2 v2 1/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue Date: Fri, 16 Dec 2022 17:50:59 +0800 Message-ID: <20221216095059.3088439-2-xiewenyi2@huawei.com> In-Reply-To: <20221216095059.3088439-1-xiewenyi2@huawei.com> References: <20221216095059.3088439-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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: aHI35hNAdGNwnto0XR5i03AZx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671184269; bh=idKhCt9PXKYv0nA2ClFsoRgLT/S2/W0GgYyZXZttpL8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ZV9LqF8IhO5kRuGn3YQKM7HtYxcS70da62iUE3cBYB+sDTsPzTEk+mFN2dOVGIuEatY i7Fxqweq8iCSA55CuofzWVAvhnblFhMbkhpWYTmTVrOSqkodJWKbUD46yYxvZlViCKIvi wjg3aBDwPL69woAHFOHDTcYYjZ/ZcCpEAWw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671184271508100002 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 (#97501): https://edk2.groups.io/g/devel/message/97501 Mute This Topic: https://groups.io/mt/95706957/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-