Merged: https://github.com/tianocore/edk2/pull/3744 Commit: https://github.com/tianocore/edk2/commit/592bf33a29360e8a447ed8b75daefe94c0888642
Mike > -----Original Message----- > From: Gao, Zhichao <zhichao....@intel.com> > Sent: Sunday, December 11, 2022 11:17 PM > To: Ard Biesheuvel <a...@kernel.org>; Kinney, Michael D > <michael.d.kin...@intel.com> > Cc: devel@edk2.groups.io; Ni, Ray <ray...@intel.com> > Subject: RE: [Patch 1/1] ShellPkg/Shell: Do not set end device path if > already end > > Reviewed-by: Zhichao Gao <zhichao....@intel.com> > > Thanks, > Zhichao > > > -----Original Message----- > > From: Ard Biesheuvel <a...@kernel.org> > > Sent: Saturday, December 10, 2022 1:44 AM > > To: Kinney, Michael D <michael.d.kin...@intel.com> > > Cc: devel@edk2.groups.io; Ni, Ray <ray...@intel.com>; Gao, Zhichao > > <zhichao....@intel.com> > > Subject: Re: [Patch 1/1] ShellPkg/Shell: Do not set end device path if > > already > > end > > > > On Fri, 9 Dec 2022 at 17:00, Michael D Kinney <michael.d.kin...@intel.com> > > wrote: > > > > > > Update Shell Protocol EfiShellGetMapFromDevicePath() to not set the > > > end if the device path if it is already an end of entire device path. > > > This removes a write oprtation that can cause failures if the Device > > > Path Protocol is mapped to read-only memory. In general Device Path > > > Protocols should not be modified unless the API explicitly states that > > > the device path is modified. > > > > > > Cc: Ard Biesheuvel <a...@kernel.org> > > > Cc: Ray Ni <ray...@intel.com> > > > Cc: Zhichao Gao <zhichao....@intel.com> > > > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > > > > Reviewed-by: Ard Biesheuvel <a...@kernel.org> > > > > > --- > > > ShellPkg/Application/Shell/ShellProtocol.c | 8 +++++++- > > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > > > diff --git a/ShellPkg/Application/Shell/ShellProtocol.c > > > b/ShellPkg/Application/Shell/ShellProtocol.c > > > index 509eb60e40f4..e6d20ab16479 100644 > > > --- a/ShellPkg/Application/Shell/ShellProtocol.c > > > +++ b/ShellPkg/Application/Shell/ShellProtocol.c > > > @@ -294,7 +294,13 @@ EfiShellGetMapFromDevicePath ( > > > *DevicePath = NextDevicePathNode (*DevicePath); > > > } > > > > > > - SetDevicePathEndNode (*DevicePath); > > > + // > > > + // Do not call SetDevicePathEndNode() if the device path node is > > already the > > > + // end of an entire device path. > > > + // > > > + if (!IsDevicePathEnd (*DevicePath)) { > > > + SetDevicePathEndNode (*DevicePath); > > > + } > > > } > > > > > > /* > > > -- > > > 2.37.1.windows.1 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97320): https://edk2.groups.io/g/devel/message/97320 Mute This Topic: https://groups.io/mt/95562992/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-