From: Jian J Wang <jian.j.wang@intel.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>, Ray Ni <ray.ni@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>
Subject: [PATCH v2 1/2] MdePkg/UefiDevicePathLib: Add sanity check for FilePath device path
Date: Tue, 19 Feb 2019 17:21:38 +0800 [thread overview]
Message-ID: <20190219092139.844-2-jian.j.wang@intel.com> (raw)
In-Reply-To: <20190219092139.844-1-jian.j.wang@intel.com>
> v2: fix wrong detection of FilePath device path
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1497
Current implementation of IsDevicePathValid() is not enough for type
of MEDIA_FILEPATH_DP, which has NULL-terminated string in the device
path. This patch add a simple NULL character check at Length position.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
---
MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
index 5d7635fe3e..dd1bddc1c2 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
@@ -95,6 +95,15 @@ IsDevicePathValid (
return FALSE;
}
}
+
+ //
+ // FilePath must be a NULL-terminated string.
+ //
+ if (DevicePathType (DevicePath) == MEDIA_DEVICE_PATH &&
+ DevicePathSubType (DevicePath) == MEDIA_FILEPATH_DP &&
+ *(CHAR16 *)((UINT8 *)DevicePath + NodeLength - 2) != 0) {
+ return FALSE;
+ }
}
//
--
2.17.1.windows.2
next prev parent reply other threads:[~2019-02-19 9:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 9:21 [PATCH v2 0/2] Add sanity check for FilePath device path Jian J Wang
2019-02-19 9:21 ` Jian J Wang [this message]
2019-02-19 9:34 ` [PATCH v2 1/2] MdePkg/UefiDevicePathLib: " Ni, Ray
2019-02-19 10:12 ` Wang, Jian J
2019-02-19 13:11 ` Ni, Ray
2019-02-19 9:21 ` [PATCH v2 2/2] MdePkg/UefiDevicePathLibDevicePathProtocol: " Jian J Wang
2019-02-19 9:23 ` [PATCH v2 0/2] " Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190219092139.844-2-jian.j.wang@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox