From nobody Sun Feb 8 11:45:33 2026 Received: from mail-oo1-f73.google.com (mail-oo1-f73.google.com [209.85.161.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E48D22C0F7F for ; Thu, 8 Jan 2026 05:07:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767848876; cv=none; b=Tl1pUHu1CGL+2+gkGpN+5Tq6E7ybOM0Zt8yuVYSmQl3dVRi/+3ZF2Bb/aK4smZl2T4xVsC4MsZZbSmyGjXkSXTDwS+MdQvl9UboHVWC4EBm7D6tCUISzaqVSEfwh8F8w7Bwc4YRELt2skSUHwAiKAjHwat9LK87Rn8dglgzItFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767848876; c=relaxed/simple; bh=LNdHpOYhkvVAHh3PEnvRLPGEb6i8i1k190yRkr69lE8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EV9Dr3BgREop/7qhSxGpWR8yuOkNrfKtJ1Ylbus3OSCtI+lFTVIzCTJu3uZlIwwy9kGkgaH+6S+H43+caZT42PYWDLn6m/z9rxou5msPy/9F+DKr9oUuyetv+mvmuyTYIdGBI2qYDf9SX0GnhQkdqlSvOyLhFCqd1iQEzX0parU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=aQm7idG6; arc=none smtp.client-ip=209.85.161.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="aQm7idG6" Received: by mail-oo1-f73.google.com with SMTP id 006d021491bc7-65b26eca9c7so5727340eaf.0 for ; Wed, 07 Jan 2026 21:07:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767848873; x=1768453673; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dZQOsX2pgJ2tnboOIsX6ynvBnKeb3FSCcqmuKWQBi3o=; b=aQm7idG6Y8g87Tiq+iYeWpgRtGJyR9GxZJL2qWkk1Mpex0dYB2FSa+FlKn2huOXG5X IOsATT1PUDq60qH3nOXOR9M+ldjznDn+KVVHQDSZeTBOpln0U0bAQmqwbxgo+p7huEmv F0RGbDBs8Il9IVQ9I2AW0j9fhLalHaZcFyIEruGDprYEUD1atGDRyFgBcPnKXGFAxHRN BV2t4Vw3Z5LGdBQkc86YsVkuAGFOMNec+OA7a4bxLFawz6bcCvXdIOr08GnFergcQarp /1bCRZnr9M4xev5emzx33g7F8pSEVxjcPTsSdtTe8TdoBkmKew/RkQai3lSprfLuCDr0 12zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767848873; x=1768453673; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dZQOsX2pgJ2tnboOIsX6ynvBnKeb3FSCcqmuKWQBi3o=; b=bRWvACHCfSLFQEK2FUF4kE/JsHL23mCyea1g+bJnrlsbvEpOTblyXd+GgqcTj4DITq iGpfI3hwNqaAj3pFNEPKATSx1Bwp/fYQmjMJwsc83Z3otUVCs5+KoYZXLZrbO1sNqizw u6WDqVccmqZTjnnWCZewqG375l3e9Z5Y51OzqxCZ7tRF4xB6mHSC82Br94OIS8Aw6jfW F3Xh7PJqUlqWaqkGvfG3v/db04iqOVS/weYR5IwbEUdDG627ymka5DmhHJUkbJa2hLIm u918q9aJXJEqksya62mf3xh0JXz39hq4wyq/gxlsEgaa3JcTVML2c9inqGJMLq6102qT C3Xw== X-Gm-Message-State: AOJu0YwmocRrI8eH903gU8FkOY9y+FTOs+ozDbSmNF6CZITQQk4JY3I9 JmkMr7Q2dsiegrS7LA2H8PwnS1O+24C4gTTg2Rg45T6l2OvdxWMsfZjC18ZKWn4ls3mCJqibcZI /mxjlDg== X-Google-Smtp-Source: AGHT+IFrclr5UQo7zl+uW+fx86un/1H6WIw+B6ZZGi+Mh3xwDR/cU/G0W87Tu8yHbTlESc7N66Kjw62yaIA= X-Received: from ilbdr9.prod.google.com ([2002:a05:6e02:3f09:b0:439:46f3:4729]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a4a:d666:0:b0:65c:f12c:e74e with SMTP id 006d021491bc7-65f54ec7815mr1678998eaf.6.1767848872864; Wed, 07 Jan 2026 21:07:52 -0800 (PST) Date: Thu, 8 Jan 2026 05:07:46 +0000 In-Reply-To: <20260108050748.520792-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260108050748.520792-1-avagin@google.com> X-Mailer: git-send-email 2.52.0.351.gbe84eed79e-goog Message-ID: <20260108050748.520792-2-avagin@google.com> Subject: [PATCH 1/3] binfmt_elf_fdpic: fix AUXV size calculation for ELF_HWCAP3 and ELF_HWCAP4 From: Andrei Vagin To: Kees Cook Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, criu@lists.linux.dev, Andrew Morton , Chen Ridong , Christian Brauner , David Hildenbrand , Eric Biederman , Lorenzo Stoakes , Michal Koutny , Andrei Vagin , Mark Brown , Max Filippov Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 4e6e8c2b757f ("binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4") added support for AT_HWCAP3 and AT_HWCAP4, but it missed updating the AUX vector size calculation in create_elf_fdpic_tables() and AT_VECTOR_SIZE_BASE in include/linux/auxvec.h. Similar to the fix for ELF_HWCAP2 in commit c6a09e342f8e ("binfmt_elf_fdpic: fix AUXV size calculation when ELF_HWCAP2 is defined"), this omission leads to a mismatch between the reserved space and the actual number of AUX entries, eventually triggering a kernel BUG_ON(csp != =3D sp). Fix this by incrementing nitems when ELF_HWCAP3 or ELF_HWCAP4 are defined and updating AT_VECTOR_SIZE_BASE. Cc: Mark Brown Cc: Max Filippov Fixes: 4e6e8c2b757f ("binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4") Signed-off-by: Andrei Vagin Reviewed-by: Mark Brown Reviewed-by: Michal Koutn=C3=BD --- fs/binfmt_elf_fdpic.c | 6 ++++++ include/linux/auxvec.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 48fd2de3bca0..a3d4e6973b29 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -595,6 +595,12 @@ static int create_elf_fdpic_tables(struct linux_binprm= *bprm, #ifdef ELF_HWCAP2 nitems++; #endif +#ifdef ELF_HWCAP3 + nitems++; +#endif +#ifdef ELF_HWCAP4 + nitems++; +#endif =20 csp =3D sp; sp -=3D nitems * 2 * sizeof(unsigned long); diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h index 407f7005e6d6..8bcb9b726262 100644 --- a/include/linux/auxvec.h +++ b/include/linux/auxvec.h @@ -4,6 +4,6 @@ =20 #include =20 -#define AT_VECTOR_SIZE_BASE 22 /* NEW_AUX_ENT entries in auxiliary table */ +#define AT_VECTOR_SIZE_BASE 24 /* NEW_AUX_ENT entries in auxiliary table */ /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF= } */ #endif /* _LINUX_AUXVEC_H */ --=20 2.52.0.351.gbe84eed79e-goog