From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f73.google.com (mail-oa1-f73.google.com [209.85.160.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 E37132737EE for ; Tue, 17 Feb 2026 18:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351276; cv=none; b=sNWTO4PNxtTFHP5a0QUUWA4rJVGEo3i3Iby6HuGkX2Tvp+M1+PVc0p9eOJsF7S+qVcphbNtkkASkpbyogkfvQy1Pud2x9wOVUbJF9Y+ug4i0T/NP9/Zalpbt89UMt6qcgZkMGArukmnxniKPirwqvOE/RXKP6ZJw1fcL82MeUQQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351276; c=relaxed/simple; bh=zFws/lBJDBflGBbsfpNrklciHMFXvn4h47ireyoBTMQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aoM7iJH9BZEW9u5P6GURhJgkaPKXKhwfx9QF40G4Y43EpPVELtVx/ex1FOBXipSEaI4zwzFjT6nb9o5BZyvz8W+A6CXNQW4GmRKk7MKazee03Z6/ROEuqo4nt2HKkDMCzPYg7fPgnzwAHXpeihPe/TVzaOqhCN5pQcNqKHO38sU= 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=LRLgFua7; arc=none smtp.client-ip=209.85.160.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="LRLgFua7" Received: by mail-oa1-f73.google.com with SMTP id 586e51a60fabf-40eb7df00b2so39978320fac.3 for ; Tue, 17 Feb 2026 10:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771351273; x=1771956073; darn=lists.linux.dev; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=BWILvLkFP9VgHvdYSVEMstLcXKjVhz4il8XVeiAhgTI=; b=LRLgFua7DWMWI4HtZhGr93RQXd8q+pb7bOkVNvv7oQsm2Za/8Wpqj+XMLdej8vEO2p am8pBZ8X47mfGjl/g0QdQ7uxKr+Y8ADghM2d8QeHNu30HpdzRTNOJTcucNMM1ZwVI0rX WJV74F6MIMiaMERT75XvyBln6YrJ6eArSseuPAVQsD+18nWhB/322dSTVucvFirB0M8y 1Pqdml5b0j3BDMpI+pI3f3MMkApHzhvB4CaEjORSsqRKetPLnKraALNosDXeLpgO7Zvy 6JX1vuyjat6XyHtaD4/4BOTc14q0n69biUlnofnRCupaUOe9JuuRsdqE2O/fvnNK3jly +WbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771351273; x=1771956073; h=content-transfer-encoding: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=BWILvLkFP9VgHvdYSVEMstLcXKjVhz4il8XVeiAhgTI=; b=m1RFC8yFgMcllvJNP5QU6siUJILY9m8n+tHXSDmMFtqWAzDqaYCCtzD+GricQvNM1Y +uGCwRP+OO9zb2FeViH8oKzuGCPo/ZXdQ4Fb0L+Uzrj6X7WaIvtWZkl3aR+lBuIGn6th VjB10mpI1vxglE1WDli3pGgpgqjyC0KwEflxB+CuEncca8o4+V0tWgRlrE2YWgHHaKa+ XChDR+BrgQhCuk81GqLeM+irpxR5bXaYb0xiPAY+u0C023veQtk9ErOrqSu9j+JleljO S5unYUepOeln0n2q+qMpR3C51y1QbgXcjLlTz0cS9npqmUUcShKT+KJSyGVYFsg8BDd4 MfzQ== X-Forwarded-Encrypted: i=1; AJvYcCVVl3umoOIrcFaheIylMSTzRlndOWFcONq/Wm+SMUTQqxkfGIsKdkpzhWS25BqRY/YR20z4@lists.linux.dev X-Gm-Message-State: AOJu0YyE+KQ88cB7pvRx5+xRbHglrBKvhSE0PjjAnylyKW7qaX+gZtkl MS67e5M3LsNFRUEh7QqSntWqzBLCNeFQndTseI0+hJrh97AKv25SSR8/EJy32UVam/VMf/nGe19 WjMxi9w== X-Received: from jabko7.prod.google.com ([2002:a05:6638:8f07:b0:5ca:4c19:c2b7]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:458d:b0:663:364:674f with SMTP id 006d021491bc7-67858fea6bfmr4750317eaf.1.1771351272644; Tue, 17 Feb 2026 10:01:12 -0800 (PST) Date: Tue, 17 Feb 2026 18:01:05 +0000 In-Reply-To: <20260217180108.1420024-1-avagin@google.com> Precedence: bulk X-Mailing-List: criu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260217180108.1420024-1-avagin@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260217180108.1420024-2-avagin@google.com> Subject: [PATCH 1/4] binfmt_elf_fdpic: fix AUXV size calculation for ELF_HWCAP3 and ELF_HWCAP4 From: Andrei Vagin To: Kees Cook , Andrew Morton Cc: Cyrill Gorcunov , Mike Rapoport , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, criu@lists.linux.dev, Chen Ridong , Christian Brauner , David Hildenbrand , Eric Biederman , Lorenzo Stoakes , Michal Koutny , Andrei Vagin , Mark Brown , Max Filippov , Alexander Mikhalitsyn Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 AT_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 Reviewed-by: Michal Koutn=C3=BD Reviewed-by: Mark Brown Reviewed-by: Cyrill Gorcunov Reviewed-by: Alexander Mikhalitsyn Fixes: 4e6e8c2b757f ("binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4") Signed-off-by: Andrei Vagin --- 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.53.0.310.g728cabbaf7-goog