From nobody Fri May 3 21:36:01 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+92375+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+92375+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1660206719; cv=none; d=zohomail.com; s=zohoarc; b=ZuoJM/7MBSq236JSE+whI+soJ53EZVgZDwkOF4fXp4DuFLBgkqkWDcnqE5IfoO+9P31Afu4oV+YdZsGChJPCjsfbGwPfqxdVxP0rX4j01uM+1CsVt2ix6erVXkFVqngKyGlRJ5JuMxyCApGZsGowG9+zphVLLzs9SIXJxXNh960= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660206719; 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=csbUTnV10n/Uy882XqTeEEA69dQqPOtNU2Ep4H8LtyA=; b=GHGWk8zCBCj6AsLV21e4O1iylzEnMx5KDA36VJDGa4T7KYOXAQY8CiufmdaJzQaRCXcBJ2m7Sn4hHTDjZII+MkqGLDpWAhFfnHTwcKf/M7Q/0qxeogOMJsmMriu1MMKWiluu0ef3mrk8SpL4vmwvdp7r70pSBWM+gq5sJCAxpH4= 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+92375+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1660206719589769.6073745263853; Thu, 11 Aug 2022 01:31:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id dSrGYY1788612x7RCVtqnM6L; Thu, 11 Aug 2022 01:31:58 -0700 X-Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web10.4160.1660206716941839600 for ; Thu, 11 Aug 2022 01:31:57 -0700 X-Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4M3Kjn29QMzmVgG; Thu, 11 Aug 2022 16:29:49 +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, 11 Aug 2022 16:31:53 +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, 11 Aug 2022 16:31:53 +0800 From: "wenyi,xie via groups.io" To: , , , , CC: , Subject: [edk2-devel] [PATCH EDK2 v1 1/1] MdeModulePkg/BaseBmpSupportLib: Fix ColorMap issue Date: Thu, 11 Aug 2022 16:31:46 +0800 Message-ID: <20220811083146.3954530-2-xiewenyi2@huawei.com> In-Reply-To: <20220811083146.3954530-1-xiewenyi2@huawei.com> References: <20220811083146.3954530-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) 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: oh2ibkpPHLxjMQQB1cqo7XkHx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660206718; bh=DUP+hXyoTpZ2wFLjWY373ckc0qxNTCK19xXJkI0f8Cw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=MZoE3Z96pIqc/zWrYjJA6uWysyoxfvGMxNXMtefFO3F16Pngyoa2lnJemf0bcZxfygr 1aAXyScYWVyH55zqj2yX5LD3rb+TZG8CIozZQFPf9KcoWqH9ZVbmFSwdoixnUkoFR8HfY QPGIFkTUxbo0Qf7E8F2vxSToAm6ah/S5leE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660206720477100002 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 --- MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c b/MdeMo= dulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c index c5e885d7a6d5..bea89d530de6 100644 --- a/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c +++ b/MdeModulePkg/Library/BaseBmpSupportLib/BmpSupportLib.c @@ -236,6 +236,11 @@ 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 (#92375): https://edk2.groups.io/g/devel/message/92375 Mute This Topic: https://groups.io/mt/92954452/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-