diff options
author | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-01-27 14:49:47 +0000 |
---|---|---|
committer | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-01-27 14:49:47 +0000 |
commit | 6dec88649aefe8c302d32871adfe791407911788 (patch) | |
tree | cb30fb49d8df2abca11041e8439418d2b5567fc5 | |
parent | 90f1486c8ebc891e3c69fc98d8efa372b0c4806c (diff) | |
download | edk2-6dec88649aefe8c302d32871adfe791407911788.zip edk2-6dec88649aefe8c302d32871adfe791407911788.tar.gz edk2-6dec88649aefe8c302d32871adfe791407911788.tar.bz2 |
Fix a security hole in shell binaries:
For gBS->LoadImage() if the return status is EFI_SECURITY_VIOLATION, the image handle may not be NULL.
Shell environment should not have the assumption that the output ImageHandle must be NULL if the error status is returned by gBS->LoadImage().
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9838 6f19259b-4bc3-4df7-8a09-765794883524
92 files changed, 18 insertions, 2 deletions
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi Binary files differindex 104879a..6ddc3ae 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi Binary files differindex 9caf7f7..fad072a 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi Binary files differindex e955e1a..4351222 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi Binary files differindex bf11f0d..a0f49d2 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi Binary files differindex 312e517..299da06 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi Binary files differindex 216a7be..091b88b 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi Binary files differindex b5dd97f..49b680a 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi Binary files differindex 56ade1c..071f320 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi Binary files differindex 2b8f35b..909b37a 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi Binary files differindex 5af429e..995251d 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi Binary files differindex 29e4737..54b8313 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi Binary files differindex 4731764..802dd5b 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi Binary files differindex 6f270b1..858b401 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi Binary files differindex c324134..64ae861 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi Binary files differindex 759d096..a920463 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi Binary files differindex acf3aa1..8914cb6 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi Binary files differindex 9552fe0..8459d04 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi Binary files differindex 2238af9..0d26d19 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi Binary files differindex 073e77d..690a46b 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi Binary files differindex c8ccad0..9339b7f 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi Binary files differindex 32318c8..279b374 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi Binary files differindex c94ef49..4e9a8ad 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi Binary files differindex 77ab9f8..967093e 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi Binary files differindex 9ffe2a6..02ce6b2 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi Binary files differindex 1593a8f..2f9a045 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi Binary files differindex 1a7b0cc..ce3bd24 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi Binary files differindex cf059d1..2511644 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi Binary files differindex 1842794..b2c8768 100644 --- a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi +++ b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi Binary files differindex d45552f..a1c6ba4 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi Binary files differindex 8e6aad2..193ae20 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi Binary files differindex cebd77e..649031c 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi Binary files differindex 3f1c0fd..f53f5b0 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi Binary files differindex 6823865..8ce7185 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi Binary files differindex 8dccbde..de78afe 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi Binary files differindex 3be69d1..2893adb 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi Binary files differindex 5809ecb..3d1dad2 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi Binary files differindex d781a53..7407651 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi Binary files differindex b5bad29..1f69265 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi Binary files differindex 0ed43f4..6191d1e 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi Binary files differindex 44eb55d..ef4e32a 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi Binary files differindex 48fcde6..5fe5627 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi Binary files differindex e3404c1..5fe3ceb 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi Binary files differindex 531a5f5..325c4cb 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi Binary files differindex 40e04200..9bff0fd 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi Binary files differindex 89403a9..adf0716 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi Binary files differindex 61319bb..5e7dc0e 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi Binary files differindex 52667c4..3a6b6d7 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi Binary files differindex 5e99f58..55027c8 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi Binary files differindex d2e5530..0a8b0c8 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi Binary files differindex 4f56b5f..b1755b7 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi Binary files differindex 33f5a1b..7d7ebde 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi Binary files differindex b54d36b..807dfa6 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi Binary files differindex ef0232e..9dbb666 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi Binary files differindex 3d2cf4a..aebb8d7 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi Binary files differindex ec351a8..a85e031 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi Binary files differindex 4802b55..15683ef 100644 --- a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi +++ b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi Binary files differindex dc4f29f..dabd93e 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi Binary files differindex 957b3a5..7067407 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi Binary files differindex 3005dcb..811c456 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi Binary files differindex 4fe3587..b13a851 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi Binary files differindex b8899ff..2a5d110 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi Binary files differindex ee2e244..df0cddf 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi Binary files differindex 73e9608..25516b4 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi Binary files differindex fcfe219..ca780a0 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi Binary files differindex b6e3aec..dc6e4c2 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi Binary files differindex f509b2f..c46df50 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi Binary files differindex effc7d4..a846d25 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi Binary files differindex febb97a..1e6d9dd 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/comp.efi b/EdkShellBinPkg/Bin/X64/Apps/comp.efi Binary files differindex 1497c6c..af2d2a8 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/comp.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/comp.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi Binary files differindex b4f1bd6..91eb3a4 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi Binary files differindex 540b653..5588b57 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/edit.efi b/EdkShellBinPkg/Bin/X64/Apps/edit.efi Binary files differindex 8a63921..5187fba 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/edit.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/edit.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi Binary files differindex f551f00..c186539 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi Binary files differindex a8cda71..cffe2b1 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/err.efi b/EdkShellBinPkg/Bin/X64/Apps/err.efi Binary files differindex 6468d0c..1987210 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/err.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/err.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi Binary files differindex 630f07c..e423d9d 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/mem.efi b/EdkShellBinPkg/Bin/X64/Apps/mem.efi Binary files differindex 51da8e4..18a3557 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/mem.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/mem.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi Binary files differindex 2258d3b..2404724 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/mm.efi b/EdkShellBinPkg/Bin/X64/Apps/mm.efi Binary files differindex 91393ce..f241998 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/mm.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/mm.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/mode.efi b/EdkShellBinPkg/Bin/X64/Apps/mode.efi Binary files differindex 2a4f44d..bae7cfe 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/mode.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/mode.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/pci.efi b/EdkShellBinPkg/Bin/X64/Apps/pci.efi Binary files differindex 0fd1883..8edee34 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/pci.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/pci.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi Binary files differindex a77e6c5..c33cdc8 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/stall.efi b/EdkShellBinPkg/Bin/X64/Apps/stall.efi Binary files differindex 3fb1dbb..21ed51c 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/stall.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/stall.efi diff --git a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi Binary files differindex b54605b..b0baa0f 100644 --- a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi +++ b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi diff --git a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi Binary files differindex 8af463b..c416e96 100644 --- a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi +++ b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi diff --git a/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi Binary files differindex c18a1ec..b31790f 100644 --- a/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi +++ b/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi diff --git a/EdkShellBinPkg/FullShell/X64/Shell_full.efi b/EdkShellBinPkg/FullShell/X64/Shell_full.efi Binary files differindex 2329030..b39268d 100644 --- a/EdkShellBinPkg/FullShell/X64/Shell_full.efi +++ b/EdkShellBinPkg/FullShell/X64/Shell_full.efi diff --git a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi Binary files differindex fb4ac3f..974f380 100644 --- a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi +++ b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi diff --git a/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi b/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi Binary files differindex be21bc6..f2a27cd 100644 --- a/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi +++ b/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi diff --git a/EdkShellBinPkg/MinimumShell/X64/Shell.efi b/EdkShellBinPkg/MinimumShell/X64/Shell.efi Binary files differindex cef9217..ee61fc1 100644 --- a/EdkShellBinPkg/MinimumShell/X64/Shell.efi +++ b/EdkShellBinPkg/MinimumShell/X64/Shell.efi diff --git a/EdkShellBinPkg/ReadMe.txt b/EdkShellBinPkg/ReadMe.txt index e4a2e33..75a2f60 100644 --- a/EdkShellBinPkg/ReadMe.txt +++ b/EdkShellBinPkg/ReadMe.txt @@ -1,10 +1,11 @@ -The binaries of EdkShellBinPkg are generated with Efi-Shell-Dev-Snapshot-20091214.zip and build with Edk Compatibility & BaseTools Package
+The binaries of EdkShellBinPkg are generated with Efi-Shell-Dev-Snapshot-20091214.zip (plus a security hot-fix see EdkShellbinPkg\SecurityPatch.diff) and build with Edk Compatibility & BaseTools Package
(r9623)
The following steps can help to re-generate these binaries for customization:
1. Check out EdkCompatibilityPkg (r9623) to $(WORKSPACE)\EdkCompatibilityPkg (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg).
2. Check out EdkShellPkg(r9623) to $(WORKSPACE)\EdkShellPkg (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkShellPkg).
-3 Check out Edk Shell project source (r36) to $(WORKSPACE) (svn https://efi-shell.tianocore.org/svn/efi-shell/trunk/Shell). It is read-only and current revison (r36) is identical to Efi-Shell-Dev-Snapshot-20091214.zip.
+3a.Check out Edk Shell project source (r36) to $(WORKSPACE) (svn https://efi-shell.tianocore.org/svn/efi-shell/trunk/Shell). It is read-only and current revison (r36) is identical to Efi-Shell-Dev-Snapshot-20091214.zip.
+3b.Apply the security hot fix in EdkShellBinPkg\SecurityPatch.diff to patch in Shell\shellenv\exec.c
4. Update to the newest BaseTools package. (r9623 or later)
5. Under workspace directory (i.e. c:\EdkII),
To generate Minimum Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\Shell.inf"
diff --git a/EdkShellBinPkg/SecurityPatch.diff b/EdkShellBinPkg/SecurityPatch.diff new file mode 100644 index 0000000..01a05c0 --- /dev/null +++ b/EdkShellBinPkg/SecurityPatch.diff @@ -0,0 +1,15 @@ +Index: shellenv/exec.c
+===================================================================
+--- shellenv/exec.c (revision 36)
++++ shellenv/exec.c (working copy)
+@@ -2079,6 +2079,10 @@
+ if (!EFI_ERROR (Status)) { + goto Done; + } else { ++ // ++ // Set ImageHandle to NULL if any error status is returned. ++ // ++ ImageHandle = NULL; + Status = LibGetImageHeader ( + DevicePath, + &DosHeader, |