From 447735c1707da8c2600f899e5af5bfcabdd6ee9e Mon Sep 17 00:00:00 2001 From: ShuaixinHuang <1836656514@qq.com> Date: Thu, 19 Nov 2026 19:25:19 +0800 Subject: [PATCH] fix(android): require AVB vbmeta to follow the original image (#12271) Co-authored-by: ShuaixinHuang <197200901+ShuaixinHuang@users.noreply.github.com> --- .../AndroidBootImageArtifactReader.test.ts | 19 +++++++++++++++++++ src/artifacts/AndroidBootImageFormat.ts | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/src/artifacts/AndroidBootImageArtifactReader.test.ts b/src/artifacts/AndroidBootImageArtifactReader.test.ts index ded0324582..f52bfbb04f 100644 --- a/src/artifacts/AndroidBootImageArtifactReader.test.ts +++ b/src/artifacts/AndroidBootImageArtifactReader.test.ts @@ -382,3 +382,22 @@ it("finds an AVB footer before the final boot page boundary", async () => { avb_vbmeta_size: 256, }); }); + +it.each([1, 32])( + "refuses vbmeta starting at original image end minus %i", + async (overlap) => { + const image = buildBootImage({ + version: 0, + kernel: Buffer.alloc(64), + ramdisk: Buffer.alloc(0), + }); + const bytes = appendAvbFooter(image, { + vbmeta: Buffer.alloc(16), + vbmetaOffset: image.length - overlap, + }); + const path = await writeCarrier("overlapping-original-image.img", bytes); + await expect(scanCanonicalArtifactInventory(path)).rejects.toThrow( + /AVB vbmeta overlaps the original boot image/u, + ); + }, +); diff --git a/src/artifacts/AndroidBootImageFormat.ts b/src/artifacts/AndroidBootImageFormat.ts index a26d765ce9..bc234021d1 100644 --- a/src/artifacts/AndroidBootImageFormat.ts +++ b/src/artifacts/AndroidBootImageFormat.ts @@ -1187,6 +1187,10 @@ const readAvbFooter = (input: { input.headerOccupied, input.components, ); + // vbmeta is appended after the original image, including any padding + // within that image. Existing component checks name specific collisions. + if (vbmetaSize > 0 && vbmetaOffset < originalImageSize) + formatError("AVB vbmeta overlaps the original boot image"); return { present: true, footerSize: AVB_FOOTER_SIZE,