From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 648703C09F3; Tue, 21 Jul 2026 21:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668516; cv=none; b=tJXxwMFx3SqXTSQ96a2ecwU7TPdowjlf3ILucv1/J7W9sl62fIdbCBmhsNQrSdPP22DSfM5Z5XvegTbnOKbkpQ4a54qJsTf+/tboeV8WNWgskP3yuwDjVqwYmJQsNMXuC9vMTE0d1ImDWfUQoHCNLDMyLM3AClyFRSs1peN3lao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668516; c=relaxed/simple; bh=p9ohMpnkZkMrXlpPADD8RnyCAVTDEcE1hc0fOgzmcpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kqwWQmyP6hxmAx+eSQlm8V444bscQVkhtVU05k/F8NwYFeifjM/Dg2I7Q3Pmg24A6APfcFRFUlLdP/EN8z89vJuNzDQ+9gbHmBRinaQ4jAFX5cU5xvy3Y7VbGW5rR2PQiN80A9b2RAvV5bRE58qCcbX6yVFp9lzqPEYYWEyn2YI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BSYue817; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BSYue817" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCA3D1F00A3A; Tue, 21 Jul 2026 21:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668515; bh=SAdPeUHkMV+bwxUkZBcGobMx9CbK+ZvHxKIXZJT8nkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BSYue81742byqGHB4w5QLj6qNwaAoBchkotipsWhyP+TC/AAelcGcZyx/p0YYCXC5 rpehuRedhmHEIuxBfzFN0O5tBQ3ndnodC7hNiX/wymH9lV5I4qbECJFRyLLwhE/0Ul rbmZHCrPeeCXOUYKS8D7B6iAFXSRvR9ITjOzfPoQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bryam Vargas , Philippe De Muyter , Jens Axboe Subject: [PATCH 6.1 0206/1067] partitions: aix: bound the pp_count scan to the ppe array Date: Tue, 21 Jul 2026 17:13:27 +0200 Message-ID: <20260721152429.201189570@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bryam Vargas commit 2dc0bfd2fe355fb930de63c2f2eb8ced8570c579 upstream. aix_partition() reads the physical volume descriptor into a fixed-size struct pvd and then scans its physical-partition-extent array: int numpps = be16_to_cpu(pvd->pp_count); ... for (i = 0; i < numpps; i += 1) { struct ppe *p = pvd->ppe + i; ... lp_ix = be16_to_cpu(p->lp_ix); pvd points at a single kmalloc()'d struct pvd whose ppe[] member holds a fixed ARRAY_SIZE(pvd->ppe) (1016) entries, but the loop runs up to the on-disk pp_count. pp_count is an unvalidated __be16 read straight from the descriptor, so a crafted AIX image with pp_count larger than 1016 drives the loop to read pvd->ppe[i] past the end of the allocation (up to 65535 entries, ~2 MB out of bounds). The partition scan runs without mounting anything, when a block device with a crafted AIX/IBM partition table appears (an attacker-supplied image attached with losetup -P, or a device auto-scanned by udev), via msdos_partition() -> aix_partition(). Clamp the scan to the number of entries the ppe[] array can hold. Fixes: 6ceea22bbbc8 ("partitions: add aix lvm partition support files") Cc: stable@vger.kernel.org Signed-off-by: Bryam Vargas Acked-by: Philippe De Muyter Link: https://patch.msgid.link/20260607064137.302574-1-hexlabsecurity@proton.me Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- block/partitions/aix.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/block/partitions/aix.c +++ b/block/partitions/aix.c @@ -228,6 +228,15 @@ int aix_partition(struct parsed_partitio int next_lp_ix = 1; int lp_ix; + /* + * pvd was read into a fixed-size struct pvd whose ppe[] array + * holds ARRAY_SIZE(pvd->ppe) entries. pp_count is an + * unvalidated on-disk __be16, so clamp the scan to the array + * size to avoid walking past the allocation. + */ + if (numpps > ARRAY_SIZE(pvd->ppe)) + numpps = ARRAY_SIZE(pvd->ppe); + for (i = 0; i < numpps; i += 1) { struct ppe *p = pvd->ppe + i; unsigned int lv_ix;