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

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
index 104879a2bc60f0e6d9da7d170fe0454e56fb1bcd..6ddc3ae13a2189f70e9af51aa20f3329b98bf72f 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi
index 9caf7f7266a6922e4e7a169cad034731535ecd4b..fad072a0513c158424a2301f14fe454e41eb764e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi
index e955e1a89ca7bc3113dc332a300f78662b15decb..43512226a3234df94994a52bd1f4ea4b7d87a749 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
index bf11f0d9b4e294e3d331033596ddc21551b911cf..a0f49d27aae413987145d28383204187cf982c5d 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi
index 312e517ee2e3158255c33cf042bf72673a8c13a4..299da06b50d244a3318f987357cddd5348560b4f 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi
index 216a7be4c7a49b51ea411f3aecd41694b2ed7648..091b88b5a7f61347c7750d25cb728fa909208a4e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
index b5dd97f51b02c9fa7ea2901abf1cccba93fb9922..49b680a9a97afaf4015c50d0d15aa59a0a198990 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
index 56ade1c95b7ad0e7dec57264753610e6a2fb8cd1..071f320f9219118317a345b12af846c2077f8ef6 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
index 2b8f35b0f4f684a9449f31c49681adac49299cd0..909b37a63dc5590a01ca9862d4817f5379b6acda 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi
index 5af429e87024036e671c939b0ab17ade7f064de6..995251d37aad3861ccd8caca064f0cb066d7d2ad 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
index 29e473723c9f6f6622dd63fa46cf6eff2ab1f47b..54b8313b6e234c394536e50910655a3cc6aea896 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi
index 4731764bbcf569c792170f9fc39c151dc5700ce9..802dd5be5c9cb57cd2a4bbab231b3a320088e709 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
index 6f270b1ce767d3543f130ffd0a331f6d93c0cf8c..858b401970ea74a347666c124c37562d41a61ac7 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi
index c3241347fb94877769614278033f33f03684da2f..64ae8614b01e6beab9835777267764c573e08952 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi
index 759d0967a04837c78341ce13c9df3a86f9cce682..a9204632be41b9f29e42366b5cb60748e7dacf7f 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi
index acf3aa17aa71e42b32eedf5710f8d344ddd926ab..8914cb6c5e20b527e6eabd908a8a1e9beb0ba6ab 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi
index 9552fe07c22fb73844c84052cffd4066d1e285ec..8459d04823c2e5f3909f23da2d25cf1f23f6b803 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi
index 2238af9a0268f726920df10fcec45b5ce4619f21..0d26d1982788852252308e9711671ae661811f8e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi
index 073e77d626a8442eedcfa9f7832ea362aa1da65d..690a46ba4f3187a6a279ea71ede7af565e5a2483 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi
index c8ccad0d96d215b2345175a1d7b3b3cd650a8b2b..9339b7f92c69414a067fa50013e6e6fb01e1aca0 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi
index 32318c8f6a55079518bf0bed2773d12dc0e7e36e..279b374b3e711d4b99d6813997b326fa019d6ec6 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi
index c94ef49a7879d195c524d3a6cad9e399188ddb75..4e9a8ad485af1d6538323bca441060fdec6fbb02 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi
index 77ab9f835c9d5e24a35b68475b347d2b0de48465..967093e7a5fae955f1793c54c60b338fd06603e0 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi
index 9ffe2a61a8c5a450c6037fd9320ba0e9bd16b447..02ce6b23bcca37854b3d09923227ca36dcdace93 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi
index 1593a8f07dd30830e0aa7d3f2df4fdbdfb9f4f26..2f9a0452a559138a30361f12e3ac3d91094fb0ae 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi
index 1a7b0cc707fcec8353ab52d8900c623c8ee94098..ce3bd247756575b8bc11be248c1b64650b8361e1 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi
index cf059d171d5e167274c860d2412f94c58c0f9673..2511644e005b58ae62faa3e1695c65d13810553e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi differ

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi
index 18427940be51e1f7b367ebd7956247d13d1e7391..b2c87688c981102b61386bdbc7567dcf044baed7 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
index d45552f2e04b6a890d1b5ffe09988929e9f735d0..a1c6ba455ecef2ae48e9da032fde2dcccc9938bb 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi
index 8e6aad254b3a6e808c6fb81ffbd078681ab7585d..193ae20acb6c8685a91463ed7124f26ca63f2998 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi
index cebd77e4b11404b49190adcdde585420fa37b405..649031ca96de39cb09dc33ca823ed8e5e07b7009 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
index 3f1c0fd7a126e435da184488299e58aabf7ce9c1..f53f5b0c290ac8f5dbfd4c0b052c585ec9bb4609 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi
index 6823865ac51ba046e4fe2b979a57ad1b14933a9a..8ce71854c99fbdaaa2f45ddd4f161b1342046f49 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi
index 8dccbde4d86e6c4b1bc005610b5ab242b39fd260..de78afeb4f6fbefd4d8a9f299e9a4bda8d775e63 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
index 3be69d1b054a60d0989c6ea7b7ad1eafcef927e3..2893adb493a879fbe4e22e43809c7fbaa8219f06 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
index 5809ecb1d42e3f6589ef99993db94019ddeb8eed..3d1dad21a3361a1a30d677c8b25f966e201783a8 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
index d781a5340dd29fadea6e090940a9eaa94c208139..74076518c10be1da9b6a80aec8315b620be2f216 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi
index b5bad29c9a3e12f111e47b0345811f838f55e085..1f69265a31e17aaccdae72df5cca5edd33cf6ef9 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
index 0ed43f474e1dfe5a4a4529b5669c5f69c170eb56..6191d1e889149165429ceafe708714c2374f6b46 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi
index 44eb55d110b2df49f6d32c7a86a8c26e10ca19f2..ef4e32a3724cd14690b97503e5921e349480edf0 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
index 48fcde6c779ddcd72686d9de7806d3e1edc03503..5fe5627d984098a172f2aba1e828b1961fdb780e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi
index e3404c168fa2b7f6596d1557267fcd2ed3fd1ba4..5fe3ceba6839f3ec29fbcc41a1729f59c5265423 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi
index 531a5f5a83c8fbe8e62a3c1bc39af9ce29ff1f86..325c4cb360a3bce9cc0ae76aadb915dc62e0a62b 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi
index 40e0420079e8123e32bb52520f6637452593c252..9bff0fd179cacd1ad89315d8103bbd90e628ba18 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi
index 89403a975dabb144229a5e4b18e736e21e388d90..adf071617c3e7503853cbbf3e3865edbb2cf8242 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi
index 61319bbd5ee8dfe33628e817c21b38d8d95b4ed8..5e7dc0e5c32379d2e99131d52d2ed061624b9147 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi
index 52667c4e1814e85086a49e8e22afa2cce44c6020..3a6b6d71325c5226742addc8c6b59e8006a0ab39 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi
index 5e99f582b947538495f79478e5dfb79e82cb42e8..55027c8cf0adf4f6d0eb3b7a657b495678aeab40 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi
index d2e5530605c8b01623a87abb92eddbfd3ef96909..0a8b0c86e4fa1fe681e03a0e0233e879d1843d49 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi
index 4f56b5fe7566388340a3a4e06173109bdee7176f..b1755b7e060b68ace21d10485269032fd47b1a59 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi
index 33f5a1b9db5989e4d9c07b528b6068611c2b5eb5..7d7ebde72a9e97f3f83a828962542bd15a0b71e9 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi
index b54d36bbf9595d78b36a2ce13973b7d98a0d97b3..807dfa6507bb53116a1186c4934e133ef6089e00 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi
index ef0232ed6723562754fa9a6d59197f7344cca154..9dbb66698686d7839a3c5996e7966dadb12144fc 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi
index 3d2cf4a4b31b4b6fb0b8393140d0d167358d1fc2..aebb8d7981dd7413f812654198da74933a6a3fe7 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi
index ec351a88a695974e95e998d684ffca4665ea547f..a85e0310f50d26833c63fa8d1f296ebb7176f8a8 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi differ

diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi
index 4802b5500aaa5f8e2ffb95e416e822c5d3ff45e4..15683ef3b4e1bb92a60798742351c48cda7ff9e6 100644 (file)
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
index dc4f29fc1984a652bb6f6d606360419f5e8d8762..dabd93e6d768ea23852892d811f52cdcfa3ef09f 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi and b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi
index 957b3a5850290914e11a1dfdb9cd630b923e8bf6..7067407f689a4d454964460e7925b691d54f372a 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi and b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi
index 3005dcb1fd96e6b21598b7db55f7c7d3f3e69736..811c456091a8c35315c1c39c81e478b929bed312 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi and b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
index 4fe358739089a3945b949fa315444f1dc4081678..b13a851d0a4e64d3619c3f06bcc148571e72b14b 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi and b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi
index b8899ff3b9b54665e1989271ee06a0afd7de5d06..2a5d1108495a889b7c97bbb1332befa627782aca 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi and b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi
index ee2e244490313a0811af21a85e5f385027c6712f..df0cddfb6054a09749fc771f67cb873d063c020e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi and b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
index 73e96080f61babed7a3495d45f6f0a53e934173a..25516b4f8cdd9368b478d7935f0c200be8b9f62c 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi and b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
index fcfe2191e3ce11218638b2fead2122debceddc68..ca780a04c0ce81281ad2a283c3c7bfc0dd3d46b0 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi and b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
index b6e3aecfb7cc38477286d447ba99255ddf3e022a..dc6e4c250a9fb60e245fb5fbf963038ce1b34868 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi and b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi
index f509b2f684f0f194c2820bc3b563f30aa44a0f7a..c46df50cf8215444a76af8e98e39e7195df5be25 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi and b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
index effc7d469ec7080385e730f598c2c669588ef616..a846d256992f571ca5f4028199bcbb3a4ce217e9 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi and b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi
index febb97afec4d3bd47ae53fb770aa5598702499fe..1e6d9dd75755cfdb8c398c242b1e3ff8cb73bf9a 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi and b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/comp.efi b/EdkShellBinPkg/Bin/X64/Apps/comp.efi
index 1497c6c06217c979fbc59615df2cde44bebd55e1..af2d2a8adfc9bdf6bd32b534ba772ffbe159bfca 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/comp.efi and b/EdkShellBinPkg/Bin/X64/Apps/comp.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi
index b4f1bd641410e707b16348ad960896a7d7497f7e..91eb3a4e0decfc4d0d878d345bd1ca8df1e33e0a 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi and b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi
index 540b653d7de65280e1d32fee92a0bbc9fcc99b12..5588b57070e176990de68aa438a97bcd500596b9 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi and b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/edit.efi b/EdkShellBinPkg/Bin/X64/Apps/edit.efi
index 8a63921036b6389747f8ca4f218bc6f2017fc69b..5187fba1c36bff4b4d3150c3c01a6557619a2826 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/edit.efi and b/EdkShellBinPkg/Bin/X64/Apps/edit.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi
index f551f0086db7897e07e9a46ee89bef0cde9f9ff7..c186539078a99fe370682226fe265a7c37737baf 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi and b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi
index a8cda7170d820ff994107c9729f07cb420e26342..cffe2b147c9576fd3b28c5050cd0ca7b4f2ffce2 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi and b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/err.efi b/EdkShellBinPkg/Bin/X64/Apps/err.efi
index 6468d0cf16dedabda981d071691e9f7bc8028cf4..19872103a6682fdbe0c012f2bbd87736a23fc3d6 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/err.efi and b/EdkShellBinPkg/Bin/X64/Apps/err.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi
index 630f07c75b3a7ce053a423731785dcc8cad9bda9..e423d9dfcb710c35426fc2ea4a1b2be6be322c01 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi and b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/mem.efi b/EdkShellBinPkg/Bin/X64/Apps/mem.efi
index 51da8e480e5bacca88a4bcf160e31a70d8439270..18a3557f64dccd661976dceb7f99fc5218aade7e 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/mem.efi and b/EdkShellBinPkg/Bin/X64/Apps/mem.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi
index 2258d3b9d83308ada78d2d1c19e2a201f5045507..24047240880ce6ea931d6953185b4759e54516a4 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi and b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/mm.efi b/EdkShellBinPkg/Bin/X64/Apps/mm.efi
index 91393ce08175e0fd0fab632cf029a9c270f41022..f241998569d1e8dd06c85da425da7b9827d1f32b 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/mm.efi and b/EdkShellBinPkg/Bin/X64/Apps/mm.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/mode.efi b/EdkShellBinPkg/Bin/X64/Apps/mode.efi
index 2a4f44d31bfac7c341e3d1b521e43a6224d14f93..bae7cfec44b100317e62302ee1ea5b65dc36cdc2 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/mode.efi and b/EdkShellBinPkg/Bin/X64/Apps/mode.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/pci.efi b/EdkShellBinPkg/Bin/X64/Apps/pci.efi
index 0fd1883099e67e38e07594522c6f347ba61df4ed..8edee34ab8a64f8af24e634b1dda87c3a22a8214 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/pci.efi and b/EdkShellBinPkg/Bin/X64/Apps/pci.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi
index a77e6c5dfb2e6966da35918e022a7f47c3c604af..c33cdc8a9abbff36d7b8878d541e812f4d718a8c 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi and b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/stall.efi b/EdkShellBinPkg/Bin/X64/Apps/stall.efi
index 3fb1dbb5e8cd9888e57ff82844d256a8de3dfdd8..21ed51c36e6a4d8c1ea740dd987edc33d27de2c5 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/stall.efi and b/EdkShellBinPkg/Bin/X64/Apps/stall.efi differ

diff --git a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi
index b54605b00853750f9d8afba0eae20c29b5459a23..b0baa0fa9141c23dc4a0ed265415102a9dc5c829 100644 (file)
Binary files a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi and b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi differ

diff --git a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
index 8af463b5785bf1b102a02203469290891b878176..c416e96881eed2237a3c621db110c3264f0215ec 100644 (file)
Binary files a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi and b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi differ

diff --git a/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi
index c18a1ec292f202e2d6a6804c63ab6470ed419fba..b31790f4f4743d7e4525c12cd9d2ce201d4c1cda 100644 (file)
Binary files a/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi and b/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi differ

diff --git a/EdkShellBinPkg/FullShell/X64/Shell_full.efi b/EdkShellBinPkg/FullShell/X64/Shell_full.efi
index 23290306c4601aaa26233812faf69665f76a1dc4..b39268dd53a857145391f7a9960686ccfae83f3d 100644 (file)
Binary files a/EdkShellBinPkg/FullShell/X64/Shell_full.efi and b/EdkShellBinPkg/FullShell/X64/Shell_full.efi differ

diff --git a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi
index fb4ac3fc7e220a92b4989e64824fe59f44b71f81..974f3802b980e83d2990288692723323aad8ac80 100644 (file)
Binary files a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi and b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi differ

diff --git a/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi b/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi
index be21bc6bfbd9317e391c0f82c2e1f91e4ba8ae47..f2a27cda8b537fd67d44138a557c5cd1c29909dd 100644 (file)
Binary files a/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi and b/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi differ

diff --git a/EdkShellBinPkg/MinimumShell/X64/Shell.efi b/EdkShellBinPkg/MinimumShell/X64/Shell.efi
index cef9217ab03bd9d4806e4b9c95c8441573af0dc5..ee61fc1958a95cbf574a74f45dcb3162e6cbc379 100644 (file)
Binary files a/EdkShellBinPkg/MinimumShell/X64/Shell.efi and b/EdkShellBinPkg/MinimumShell/X64/Shell.efi differ

diff --git a/EdkShellBinPkg/ReadMe.txt b/EdkShellBinPkg/ReadMe.txt
index e4a2e335d85268887f330d27d872a6bbfaca567e..75a2f60cd5cf018d4d5ef1f6ce557416cf0c4f2b 100644 (file)
--- 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\r
+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\r
 (r9623)\r
 \r
 The following steps can help to re-generate these binaries for customization:\r
 1. Check out EdkCompatibilityPkg (r9623) to $(WORKSPACE)\EdkCompatibilityPkg (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg).\r
 2. Check out EdkShellPkg(r9623) to $(WORKSPACE)\EdkShellPkg (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkShellPkg).\r
-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. \r
+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. \r
+3b.Apply the security hot fix in EdkShellBinPkg\SecurityPatch.diff to patch in Shell\shellenv\exec.c\r
 4. Update to the newest BaseTools package. (r9623 or later)\r
 5. Under workspace directory (i.e. c:\EdkII), \r
    To generate Minimum Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\Shell.inf" \r

diff --git a/EdkShellBinPkg/SecurityPatch.diff b/EdkShellBinPkg/SecurityPatch.diff
new file mode 100644 (file)
index 0000000..01a05c0
--- /dev/null
+++ b/EdkShellBinPkg/SecurityPatch.diff
@@ -0,0 +1,15 @@
+Index: shellenv/exec.c\r
+===================================================================\r
+--- shellenv/exec.c    (revision 36)\r
++++ shellenv/exec.c    (working copy)\r
+@@ -2079,6 +2079,10 @@\r
+         if (!EFI_ERROR (Status)) {
+           goto Done;
+         } else {
++          //
++          // Set ImageHandle to NULL if any error status is returned.
++          //
++          ImageHandle = NULL;
+           Status = LibGetImageHeader (
+                      DevicePath,
+                      &DosHeader,