瀏覽代碼

[comboot] Accept only ".cbt" as an extension for COMBOOT images

COMBOOT images are detected by looking for a ".com" or ".cbt" filename
extension.  There are widely-used files with a ".com" extension, such
as "wdsnbp.com", which are PXE images rather than COMBOOT images.

Avoid false detection of PXE images as COMBOOT images by accepting
only a ".cbt" extension as indicating a COMBOOT image.

Interestingly, this bug has been present for a long time but was
frequently concealed because the filename was truncated to fit the
fixed-length "name" field in struct image.  (PXE binaries ending in
".com" tend to be related to Windows deployment products and so often
use pathnames including backslashes, which iPXE doesn't recognise as a
path separator and so treats as part of a very long filename.)

Commit 1c127a6 ("[image] Simplify image management commands and
internal API") made the image name a variable-length field, and so
exposed this flaw in the COMBOOT image detection algorithm.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 11 年之前
父節點
當前提交
d0bd383463
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1
    1
      src/arch/i386/image/comboot.c

+ 1
- 1
src/arch/i386/image/comboot.c 查看文件

@@ -229,7 +229,7 @@ static int comboot_identify ( struct image *image ) {
229 229
 
230 230
 	++ext;
231 231
 
232
-	if ( strcasecmp( ext, "com" ) && strcasecmp( ext, "cbt" ) ) {
232
+	if ( strcasecmp( ext, "cbt" ) ) {
233 233
 		DBGC ( image, "COMBOOT %p: unrecognized extension %s\n",
234 234
 		       image, ext );
235 235
 		return -ENOEXEC;

Loading…
取消
儲存